Author: gjb
Date: Fri Jul 8 00:12:29 2016
New Revision: 302409
URL: https://svnweb.freebsd.org/changeset/base/302409
Log:
Reflect head is now 12.0-CURRENT.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/UPDATING
head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
head/gnu/usr.bin/groff/tmac/mdoc.local.in
head/lib/clang/clang.build.mk
head/release/doc/share/xml/release.ent
head/sys/conf/newvers.sh
head/sys/sys/param.h
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Fri Jul 8 00:04:57 2016 (r302408)
+++ head/UPDATING Fri Jul 8 00:12:29 2016 (r302409)
@@ -16,7 +16,7 @@ from older versions of FreeBSD, try WITH
the tip of head, and then rebuild without this option. The bootstrap process
from older version of current across the gcc/clang cutover is a bit fragile.
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
FreeBSD 11.x has many debugging features turned on, in both the kernel
and userland. These features attempt to detect incorrect use of
system primitives, and encourage loud failure through extra sanity
Modified: head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
==============================================================================
--- head/gnu/usr.bin/cc/cc_tools/freebsd-native.h Fri Jul 8 00:04:57
2016 (r302408)
+++ head/gnu/usr.bin/cc/cc_tools/freebsd-native.h Fri Jul 8 00:12:29
2016 (r302409)
@@ -7,8 +7,8 @@
#define FREEBSD_NATIVE 1
/* Fake out gcc/config/freebsd<version>.h. */
-#define FBSD_MAJOR 11
-#define FBSD_CC_VER 1100002 /* form like __FreeBSD_version
*/
+#define FBSD_MAJOR 12
+#define FBSD_CC_VER 1100000 /* 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/gnu/usr.bin/groff/tmac/mdoc.local.in
==============================================================================
--- head/gnu/usr.bin/groff/tmac/mdoc.local.in Fri Jul 8 00:04:57 2016
(r302408)
+++ head/gnu/usr.bin/groff/tmac/mdoc.local.in Fri Jul 8 00:12:29 2016
(r302409)
@@ -63,6 +63,7 @@
.ds doc-operating-system-FreeBSD-10.0 10.0
.ds doc-operating-system-FreeBSD-10.1 10.1
.ds doc-operating-system-FreeBSD-11.0 11.0
+.ds doc-operating-system-FreeBSD-11.0 12.0
.
.\" Definitions for other *BSDs not (yet) in doc-common
.ds doc-operating-system-NetBSD-7.0 7.0
Modified: head/lib/clang/clang.build.mk
==============================================================================
--- head/lib/clang/clang.build.mk Fri Jul 8 00:04:57 2016
(r302408)
+++ head/lib/clang/clang.build.mk Fri Jul 8 00:12:29 2016
(r302409)
@@ -32,8 +32,8 @@ TARGET_ABI= gnueabi
TARGET_ABI= unknown
.endif
-TARGET_TRIPLE?=
${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${TARGET_ABI}-freebsd11.0
-BUILD_TRIPLE?=
${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-unknown-freebsd11.0
+TARGET_TRIPLE?=
${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${TARGET_ABI}-freebsd12.0
+BUILD_TRIPLE?=
${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-unknown-freebsd12.0
CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
Modified: head/release/doc/share/xml/release.ent
==============================================================================
--- head/release/doc/share/xml/release.ent Fri Jul 8 00:04:57 2016
(r302408)
+++ head/release/doc/share/xml/release.ent Fri Jul 8 00:12:29 2016
(r302409)
@@ -19,10 +19,10 @@
<!ENTITY release.prev.stable "9.3-RELEASE">
<!-- The next version to be released, usually used for snapshots. -->
-<!ENTITY release.next "11.0-RELEASE">
+<!ENTITY release.next "12.0-RELEASE">
<!-- The name of this branch. -->
-<!ENTITY release.branch "11-CURRENT">
+<!ENTITY release.branch "12-CURRENT">
<!-- The URL for obtaining this version of FreeBSD. -->
<!ENTITY release.url "https://www.FreeBSD.org/snapshots/";>
Modified: head/sys/conf/newvers.sh
==============================================================================
--- head/sys/conf/newvers.sh Fri Jul 8 00:04:57 2016 (r302408)
+++ head/sys/conf/newvers.sh Fri Jul 8 00:12:29 2016 (r302409)
@@ -31,8 +31,8 @@
# $FreeBSD$
TYPE="FreeBSD"
-REVISION="11.0"
-BRANCH="ALPHA6"
+REVISION="12.0"
+BRANCH="CURRENT"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h Fri Jul 8 00:04:57 2016 (r302408)
+++ head/sys/sys/param.h Fri Jul 8 00:12:29 2016 (r302409)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1100120 /* Master, propagated to newvers */
+#define __FreeBSD_version 1200000 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
