diff options
| author | dim <dim@FreeBSD.org> | 2013-10-10 20:47:11 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2013-10-10 20:47:11 +0000 |
| commit | bde695ba4cfa95738eec65083e2fa2c88c7fae81 (patch) | |
| tree | 24ddebcd34ef4c162987ce5262abc514873d9771 | |
| parent | a022b445716dcb6e4a6f0cc4292da227087526ce (diff) | |
| download | FreeBSD-src-bde695ba4cfa95738eec65083e2fa2c88c7fae81.zip FreeBSD-src-bde695ba4cfa95738eec65083e2fa2c88c7fae81.tar.gz | |
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)
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | gnu/usr.bin/cc/cc_tools/freebsd-native.h | 4 | ||||
| -rw-r--r-- | lib/clang/clang.build.mk | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index ac10c2b..e2d9f88 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h index 30cd9b1..8e523fa 100644 --- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h +++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h @@ -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. */ diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk index 2cf1e5b..e47b0a9 100644 --- a/lib/clang/clang.build.mk +++ b/lib/clang/clang.build.mk @@ -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}\" |
