summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2016-01-15 00:05:58 +0000
committermarius <marius@FreeBSD.org>2016-01-15 00:05:58 +0000
commitd65287a84ae3cd9bb7c8d5b329741ce744253ae3 (patch)
tree64e764c0a820db92e336c10a4699e94b02ee4e53
parent48b7683ce33d6b9a7f708727e0122c357625a456 (diff)
downloadFreeBSD-src-d65287a84ae3cd9bb7c8d5b329741ce744253ae3.zip
FreeBSD-src-d65287a84ae3cd9bb7c8d5b329741ce744253ae3.tar.gz
Update stable/10 from 10.2-STABLE to 10.3-PRERELEASE,
marking the official start of the code slush. Set the default mdoc(7) version to 10.3, and update the clang(1) TARGET_TRIPLE and BUILD_TRIPLE to reflect 10.3. Approved by: re (implicit)
-rw-r--r--gnu/usr.bin/groff/tmac/mdoc.local.in3
-rw-r--r--lib/clang/clang.build.mk4
-rw-r--r--sys/conf/newvers.sh4
3 files changed, 6 insertions, 5 deletions
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local.in b/gnu/usr.bin/groff/tmac/mdoc.local.in
index 6d3708f..6d9928a 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local.in
+++ b/gnu/usr.bin/groff/tmac/mdoc.local.in
@@ -50,7 +50,7 @@
.ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
.
.\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~10.2
+.ds doc-default-operating-system FreeBSD\~10.3
.
.\" FreeBSD releases not found in doc-common
.ds doc-operating-system-FreeBSD-7.4 7.4
@@ -62,6 +62,7 @@
.ds doc-operating-system-FreeBSD-10.0 10.0
.ds doc-operating-system-FreeBSD-10.1 10.1
.ds doc-operating-system-FreeBSD-10.2 10.2
+.ds doc-operating-system-FreeBSD-10.3 10.3
.ds doc-operating-system-FreeBSD-11.0 11.0
.
.\" Definitions for other *BSDs not (yet) in doc-common
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index e29efc8..7be7efa 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.2
-BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.2
+TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.3
+BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.3
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 97bec5c..70babeca 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -31,8 +31,8 @@
# $FreeBSD$
TYPE="FreeBSD"
-REVISION="10.2"
-BRANCH="STABLE"
+REVISION="10.3"
+BRANCH="PRERELEASE"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud