From 9134a3985069e879feee8149a6da96a3ad658fa8 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Wed, 23 Feb 2022 23:21:49 -0500 Subject: [PATCH] 13.1: update stable/13 to -PRERELEASE to start the release cycle Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC ("Netgate") --- Makefile.inc1 | 4 ++-- lib/clang/llvm.build.mk | 2 +- share/mk/bsd.compat.mk | 8 ++++---- sys/conf/newvers.sh | 4 ++-- usr.bin/yacc/config.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e588a288ae36..327680cad5ff 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -137,9 +137,9 @@ TARGET_ABI= gnueabi .endif .endif MACHINE_ABI?= unknown -MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.0 +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.1 TARGET_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.0 +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.1 KNOWN_ARCHES?= aarch64/arm64 \ amd64 \ armv6/arm \ diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index 4e10e6c9af9e..888e240de43e 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -40,7 +40,7 @@ TARGET_ABI= -gnueabi TARGET_ABI= .endif VENDOR= unknown -OS_VERSION= freebsd13.0 +OS_VERSION= freebsd13.1 LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI} LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION} diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index d7d63bfe55db..91b2e078cc46 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -30,7 +30,7 @@ LIB32CPUFLAGS= -march=${COMPAT_CPUTYPE} .endif .if ${COMPAT_COMPILER_TYPE} == gcc .else -LIB32CPUFLAGS+= -target x86_64-unknown-freebsd13.0 +LIB32CPUFLAGS+= -target x86_64-unknown-freebsd13.1 .endif LIB32CPUFLAGS+= -m32 LIB32_MACHINE= i386 @@ -51,7 +51,7 @@ LIB32CPUFLAGS= -mcpu=${COMPAT_CPUTYPE} .if ${COMPAT_COMPILER_TYPE} == "gcc" LIB32CPUFLAGS+= -m32 .else -LIB32CPUFLAGS+= -target powerpc-unknown-freebsd13.0 +LIB32CPUFLAGS+= -target powerpc-unknown-freebsd13.1 .endif LIB32_MACHINE= powerpc @@ -69,9 +69,9 @@ LIB32CPUFLAGS= -march=${COMPAT_CPUTYPE} .endif .else .if ${COMPAT_ARCH:Mmips64el*} != "" -LIB32CPUFLAGS= -target mipsel-unknown-freebsd13.0 +LIB32CPUFLAGS= -target mipsel-unknown-freebsd13.1 .else -LIB32CPUFLAGS= -target mips-unknown-freebsd13.0 +LIB32CPUFLAGS= -target mips-unknown-freebsd13.1 .endif .endif LIB32CPUFLAGS+= -mabi=32 diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 6e4df082ed80..045eb7da4805 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,8 +53,8 @@ # TYPE="FreeBSD" -REVISION="13.0" -BRANCH="STABLE" +REVISION="13.1" +BRANCH="PRERELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/usr.bin/yacc/config.h b/usr.bin/yacc/config.h index 0925055d3f2f..649ca3895c75 100644 --- a/usr.bin/yacc/config.h +++ b/usr.bin/yacc/config.h @@ -87,7 +87,7 @@ #define STDC_HEADERS 1 /* Define to the system name. */ -#define SYSTEM_NAME "freebsd13.0" +#define SYSTEM_NAME "freebsd13.1" /* "Define to 1 if you want to use dbmalloc for testing." */ /* #undef USE_DBMALLOC */