d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reflect head is now 12.0-CURRENT.

Browse Source 
Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Glen Barber 2016-07-08 00:12:29 +00:00
parent d6b483b209
commit ae940db11f
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UPDATING
View File

@ -16,7 +16,7 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
the tip of head, and then rebuild without this option. The bootstrap process 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. 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 FreeBSD 11.x has many debugging features turned on, in both the kernel
and userland. These features attempt to detect incorrect use of and userland. These features attempt to detect incorrect use of
system primitives, and encourage loud failure through extra sanity system primitives, and encourage loud failure through extra sanity

4
gnu/usr.bin/cc/cc_tools/freebsd-native.h
View File

@ -7,8 +7,8 @@
#define FREEBSD_NATIVE 1 #define FREEBSD_NATIVE 1
/* Fake out gcc/config/freebsd<version>.h. */ /* Fake out gcc/config/freebsd<version>.h. */
#define FBSD_MAJOR 11 #define FBSD_MAJOR 12
#define FBSD_CC_VER 1100002 /* form like __FreeBSD_version */ #define FBSD_CC_VER 1100000 /* form like __FreeBSD_version */
#undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */ #undef SYSTEM_INCLUDE_DIR /* We don't need one for now. */
#undef TOOL_INCLUDE_DIR /* We don't need one for now. */ #undef TOOL_INCLUDE_DIR /* We don't need one for now. */

1
gnu/usr.bin/groff/tmac/mdoc.local.in
View File

@ -63,6 +63,7 @@
.ds doc-operating-system-FreeBSD-10.0 10.0 .ds doc-operating-system-FreeBSD-10.0 10.0
.ds doc-operating-system-FreeBSD-10.1 10.1 .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 11.0
.ds doc-operating-system-FreeBSD-11.0 12.0
. .
.\" Definitions for other *BSDs not (yet) in doc-common .\" Definitions for other *BSDs not (yet) in doc-common
.ds doc-operating-system-NetBSD-7.0 7.0 .ds doc-operating-system-NetBSD-7.0 7.0

4
lib/clang/clang.build.mk
View File

@ -32,8 +32,8 @@ TARGET_ABI= gnueabi
TARGET_ABI= unknown TARGET_ABI= unknown
.endif .endif
TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${TARGET_ABI}-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-freebsd11.0 BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-unknown-freebsd12.0
CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \ CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \ -DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\" -DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"

4
release/doc/share/xml/release.ent
View File

@ -19,10 +19,10 @@
<!ENTITY release.prev.stable "9.3-RELEASE"> <!ENTITY release.prev.stable "9.3-RELEASE">
<!-- The next version to be released, usually used for snapshots. --> <!-- 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. --> <!-- The name of this branch. -->
<!ENTITY release.branch "11-CURRENT"> <!ENTITY release.branch "12-CURRENT">
<!-- The URL for obtaining this version of FreeBSD. --> <!-- The URL for obtaining this version of FreeBSD. -->
<!ENTITY release.url "https://www.FreeBSD.org/snapshots/"> <!ENTITY release.url "https://www.FreeBSD.org/snapshots/">

4
sys/conf/newvers.sh
View File

@ -31,8 +31,8 @@
# $FreeBSD$ # $FreeBSD$
TYPE="FreeBSD" TYPE="FreeBSD"
REVISION="11.0" REVISION="12.0"
BRANCH="ALPHA6" BRANCH="CURRENT"
if [ -n "${BRANCH_OVERRIDE}" ]; then if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE} BRANCH=${BRANCH_OVERRIDE}
fi fi

2
sys/sys/param.h
View File

@ -58,7 +58,7 @@
* in the range 5 to 9. * in the range 5 to 9.
*/ */
#undef __FreeBSD_version #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, * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,