Author: gjb
Date: Fri Oct 19 00:37:47 2018
New Revision: 339436
URL: https://svnweb.freebsd.org/changeset/base/339436
Log:
- Update head to 13.0-CURRENT.
- Bump MACHINE_TRIPLE, TARGET_TRIPLE, FBSD_MAJOR, FBSD_CC_VER,
FREEBSD_CC_VERSION, OS_VERSION.
- Update comment in UPDATING regarding debugging options.
- Remove debug.witness.trace=0 from installation media.
- Bump __FreeBSD_version.
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Modified:
head/Makefile.inc1
head/UPDATING
head/contrib/gcc/config.gcc
head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
head/lib/clang/freebsd_cc_version.h
head/lib/clang/llvm.build.mk
head/release/Makefile
head/sys/conf/newvers.sh
head/sys/sys/param.h
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Fri Oct 19 00:24:23 2018 (r339435)
+++ head/Makefile.inc1 Fri Oct 19 00:37:47 2018 (r339436)
@@ -126,9 +126,9 @@ TARGET_ABI= gnueabi
.endif
.endif
MACHINE_ABI?= unknown
-MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd12.0
+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0
TARGET_ABI?= unknown
-TARGET_TRIPLE?=
${TARGET_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd12.0
+TARGET_TRIPLE?=
${TARGET_ARCH:S/amd64/x86_64/:C/hf$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0
KNOWN_ARCHES?= aarch64/arm64 \
amd64 \
arm \
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Fri Oct 19 00:24:23 2018 (r339435)
+++ head/UPDATING Fri Oct 19 00:37:47 2018 (r339436)
@@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITHOUT_CLANG and
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 12.x IS SLOW:
- FreeBSD 12.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
+ FreeBSD 13.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
checking and fail stop semantics. They also substantially impact
Modified: head/contrib/gcc/config.gcc
==============================================================================
--- head/contrib/gcc/config.gcc Fri Oct 19 00:24:23 2018 (r339435)
+++ head/contrib/gcc/config.gcc Fri Oct 19 00:37:47 2018 (r339436)
@@ -434,6 +434,8 @@ case ${target} in
tm_defines="${tm_defines} FBSD_MAJOR=11" ;;
*-*-freebsd12 | *-*-freebsd12.*)
tm_defines="${tm_defines} FBSD_MAJOR=12" ;;
+ *-*-freebsd13 | *-*-freebsd13.*)
+ tm_defines="${tm_defines} FBSD_MAJOR=13" ;;
*)
echo 'Please update *-*-freebsd* in gcc/config.gcc'
exit 1
Modified: head/gnu/usr.bin/cc/cc_tools/freebsd-native.h
==============================================================================
--- head/gnu/usr.bin/cc/cc_tools/freebsd-native.h Fri Oct 19 00:24:23
2018 (r339435)
+++ head/gnu/usr.bin/cc/cc_tools/freebsd-native.h Fri Oct 19 00:37:47
2018 (r339436)
@@ -7,8 +7,8 @@
#define FREEBSD_NATIVE 1
/* Fake out gcc/config/freebsd<version>.h. */
-#define FBSD_MAJOR 12
-#define FBSD_CC_VER 1200001 /* form like __FreeBSD_version
*/
+#define FBSD_MAJOR 13
+#define FBSD_CC_VER 1300000 /* 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/lib/clang/freebsd_cc_version.h
==============================================================================
--- head/lib/clang/freebsd_cc_version.h Fri Oct 19 00:24:23 2018
(r339435)
+++ head/lib/clang/freebsd_cc_version.h Fri Oct 19 00:37:47 2018
(r339436)
@@ -1,3 +1,3 @@
/* $FreeBSD$ */
-#define FREEBSD_CC_VERSION 1200016
+#define FREEBSD_CC_VERSION 1300000
Modified: head/lib/clang/llvm.build.mk
==============================================================================
--- head/lib/clang/llvm.build.mk Fri Oct 19 00:24:23 2018
(r339435)
+++ head/lib/clang/llvm.build.mk Fri Oct 19 00:37:47 2018
(r339436)
@@ -17,7 +17,7 @@ CFLAGS+= -I${LLVM_SRCS}/include
CFLAGS+= -DLLVM_BUILD_GLOBAL_ISEL
CFLAGS+= -D__STDC_LIMIT_MACROS
CFLAGS+= -D__STDC_CONSTANT_MACROS
-#CFLAGS+= -DNDEBUG
+CFLAGS+= -DNDEBUG
TARGET_ARCH?= ${MACHINE_ARCH}
BUILD_ARCH?= ${MACHINE_ARCH}
@@ -33,7 +33,7 @@ TARGET_ABI= -gnueabi
TARGET_ABI=
.endif
VENDOR= unknown
-OS_VERSION= freebsd12.0
+OS_VERSION= freebsd13.0
LLVM_TARGET_TRIPLE?=
${TARGET_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI}
LLVM_BUILD_TRIPLE?=
${BUILD_ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-${VENDOR}-${OS_VERSION}
Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile Fri Oct 19 00:24:23 2018 (r339435)
+++ head/release/Makefile Fri Oct 19 00:37:47 2018 (r339436)
@@ -210,7 +210,6 @@ disc1: packagesystem
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
- echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
@@ -238,7 +237,6 @@ bootonly: packagesystem
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
- echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
@@ -263,7 +261,6 @@ dvd: packagesystem
ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
- echo debug.witness.trace=0 >> ${.TARGET}/etc/sysctl.conf
echo vfs.mountroot.timeout=\"10\" >> ${.TARGET}/boot/loader.conf
echo kernels_autodetect=\"NO\" >> ${.TARGET}/boot/loader.conf
cp ${.CURDIR}/rc.local ${.TARGET}/etc
Modified: head/sys/conf/newvers.sh
==============================================================================
--- head/sys/conf/newvers.sh Fri Oct 19 00:24:23 2018 (r339435)
+++ head/sys/conf/newvers.sh Fri Oct 19 00:37:47 2018 (r339436)
@@ -45,8 +45,8 @@
# included if the tree is modified.
TYPE="FreeBSD"
-REVISION="12.0"
-BRANCH="ALPHA10"
+REVISION="13.0"
+BRANCH="CURRENT"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h Fri Oct 19 00:24:23 2018 (r339435)
+++ head/sys/sys/param.h Fri Oct 19 00:37:47 2018 (r339436)
@@ -60,7 +60,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1200085 /* Master, propagated to newvers */
+#define __FreeBSD_version 1300000 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
