From 96f9e33c43acbb2c79d9af3abb9df904a0019b66 Mon Sep 17 00:00:00 2001 From: gjb Date: Tue, 26 Aug 2014 15:31:56 +0000 Subject: [PATCH] - Update stable/10 to 10.1-PRERELEASE now that the code slush is in effect. (Forgotten on the 22nd.) - Set the 10.1 as the .Fx mdoc(7) default. - Update the TARGET_TRIPLE and BUILD_TRIPLE for clang(1) to reflect 10.1. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation git-svn-id: svn://svn.freebsd.org/base/stable/10@270665 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- gnu/usr.bin/groff/tmac/mdoc.local | 2 +- lib/clang/clang.build.mk | 4 ++-- sys/conf/newvers.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local index 6b2791b1a..c46cc9c52 100644 --- a/gnu/usr.bin/groff/tmac/mdoc.local +++ b/gnu/usr.bin/groff/tmac/mdoc.local @@ -50,7 +50,7 @@ .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads) . .\" Default .Os value -.ds doc-default-operating-system FreeBSD\~10.0 +.ds doc-default-operating-system FreeBSD\~10.1 . .\" FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-7.4 7.4 diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk index 8590f04c3..33a7d7cb2 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}-freebsd10.1 +BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.1 CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \ -DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \ -DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\" diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 5e58584ee..7d97b8d34 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -31,8 +31,8 @@ # $FreeBSD$ TYPE="FreeBSD" -REVISION="10.0" -BRANCH="STABLE" +REVISION="10.1" +BRANCH="PRERELEASE" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi -- 2.45.0