svn commit: r256298 - in head: . gnu/usr.bin/cc/cc_tools lib/clang

[Dimitry Andric]

Author: dim
Date: Thu Oct 10 20:47:11 2013
New Revision: 256298
URL: http://svnweb.freebsd.org/changeset/base/256298

Log:
  Bump OS versions in the toolchain triples to 11.0, and bump the
  __FreeBSD_cc_version predefined macros in clang and gcc.
  
  Approved by:	re (gjb)

Modified:
  head/Makefile.inc1
  head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
  head/lib/clang/clang.build.mk

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Oct 10 20:33:18 2013	(r256297)
+++ head/Makefile.inc1	Thu Oct 10 20:47:11 2013	(r256298)
@@ -329,7 +329,7 @@ TARGET_ABI=	gnueabi
 .else
 TARGET_ABI=	unknown
 .endif
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
 XFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 .endif

Modified: head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
==============================================================================
--- head/gnu/usr.bin/cc/cc_tools/freebsd-native.h	Thu Oct 10 20:33:18 2013	(r256297)
+++ head/gnu/usr.bin/cc/cc_tools/freebsd-native.h	Thu Oct 10 20:47:11 2013	(r256298)
@@ -7,8 +7,8 @@
 #define FREEBSD_NATIVE 1
 
 /* Fake out gcc/config/freebsd<version>.h.  */
-#define	FBSD_MAJOR	10
-#define	FBSD_CC_VER	1000001		/* form like __FreeBSD_version */
+#define	FBSD_MAJOR	11
+#define	FBSD_CC_VER	1100001		/* form like __FreeBSD_version */
 
 #undef SYSTEM_INCLUDE_DIR		/* We don't need one for now. */
 #undef TOOL_INCLUDE_DIR			/* We don't need one for now. */

Modified: head/lib/clang/clang.build.mk
==============================================================================
--- head/lib/clang/clang.build.mk	Thu Oct 10 20:33:18 2013	(r256297)
+++ head/lib/clang/clang.build.mk	Thu Oct 10 20:47:11 2013	(r256298)
@@ -27,8 +27,8 @@ TARGET_ABI=	gnueabi
 TARGET_ABI=	unknown
 .endif
 
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
-BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
+BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd11.0
 CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
 		-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
 		-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"