svn commit: r284584 - in stable/10: gnu/usr.bin/groff/tmac lib/clang sys/conf

[Glen Barber]

Author: gjb
Date: Fri Jun 19 00:00:32 2015
New Revision: 284584
URL: https://svnweb.freebsd.org/changeset/base/284584

Log:
  Update stable/10 from 10.1-STABLE to 10.2-PRERELEASE,
  marking the official start of the code slush.
  
  Set the default mdoc(7) version to 10.2, and update the
  clang(1) TARGET_TRIPLE and BUILD_TRIPLE to reflect 10.2.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/gnu/usr.bin/groff/tmac/mdoc.local
  stable/10/lib/clang/clang.build.mk
  stable/10/sys/conf/newvers.sh

Modified: stable/10/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- stable/10/gnu/usr.bin/groff/tmac/mdoc.local	Thu Jun 18 23:14:45 2015	(r284583)
+++ stable/10/gnu/usr.bin/groff/tmac/mdoc.local	Fri Jun 19 00:00:32 2015	(r284584)
@@ -50,7 +50,7 @@
 .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .
 .\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~10.1
+.ds doc-default-operating-system FreeBSD\~10.2
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-7.4    7.4
@@ -61,6 +61,7 @@
 .ds doc-operating-system-FreeBSD-9.3    9.3
 .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-11.0   11.0
 .
 .\" Definitions for other *BSDs not (yet) in doc-common

Modified: stable/10/lib/clang/clang.build.mk
==============================================================================
--- stable/10/lib/clang/clang.build.mk	Thu Jun 18 23:14:45 2015	(r284583)
+++ stable/10/lib/clang/clang.build.mk	Fri Jun 19 00:00:32 2015	(r284584)
@@ -27,8 +27,8 @@ TARGET_ABI=	gnueabi
 TARGET_ABI=	unknown
 .endif
 
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.1
-BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.1
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.2
+BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.2
 CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
 		-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
 		-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"

Modified: stable/10/sys/conf/newvers.sh
==============================================================================
--- stable/10/sys/conf/newvers.sh	Thu Jun 18 23:14:45 2015	(r284583)
+++ stable/10/sys/conf/newvers.sh	Fri Jun 19 00:00:32 2015	(r284584)
@@ -31,8 +31,8 @@
 # $FreeBSD$
 
 TYPE="FreeBSD"
-REVISION="10.1"
-BRANCH="STABLE"
+REVISION="10.2"
+BRANCH="PRERELEASE"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi