Date: Thu, 24 Aug 2023 23:10:57 GMT From: Glen Barber <gjb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: aee253d8a7ae - main - update main to 15 Message-ID: <202308242310.37ONAv1K070917@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=aee253d8a7aea40189f8ca74138d6bed10948b1e commit aee253d8a7aea40189f8ca74138d6bed10948b1e Author: Glen Barber <gjb@FreeBSD.org> AuthorDate: 2023-08-24 23:10:35 +0000 Commit: Glen Barber <gjb@FreeBSD.org> CommitDate: 2023-08-24 23:10:35 +0000 update main to 15 Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- UPDATING | 4 ++-- lib/clang/freebsd_cc_version.h | 2 +- lib/clang/include/lld/Common/Version.inc | 2 +- sys/conf/newvers.sh | 4 ++-- sys/sys/param.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/UPDATING b/UPDATING index b818d4dc8d29..9ad9c04a7560 100644 --- a/UPDATING +++ b/UPDATING @@ -12,8 +12,8 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: - FreeBSD 14.x has many debugging features turned on, in both the kernel +NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: + FreeBSD 15.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 diff --git a/lib/clang/freebsd_cc_version.h b/lib/clang/freebsd_cc_version.h index e9737b10d337..277744ae8624 100644 --- a/lib/clang/freebsd_cc_version.h +++ b/lib/clang/freebsd_cc_version.h @@ -1 +1 @@ -#define FREEBSD_CC_VERSION 1400006 +#define FREEBSD_CC_VERSION 1500000 diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index 20810f686dad..b30a085c61cf 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style -#define LLD_FREEBSD_VERSION 1400006 +#define LLD_FREEBSD_VERSION 1500000 #define LLD_VERSION_STRING "16.0.6 (FreeBSD llvmorg-16.0.6-0-g7cbf1a259152-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index fcdfadcad175..40821c100161 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -52,8 +52,8 @@ # TYPE="FreeBSD" -REVISION="14.0" -BRANCH="ALPHA2" +REVISION="15.0" +BRANCH="CURRENT" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/sys/sys/param.h b/sys/sys/param.h index 89f277056069..da88c3e28581 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400096 +#define __FreeBSD_version 1500000 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308242310.37ONAv1K070917>