git: 24fed4d3aa39 - stable/12 - 12.4: update stable/12 to -PRERELEASE to start the release cycle

[Glen Barber]

The branch stable/12 has been updated by gjb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=24fed4d3aa39f012328858ac38bc4c3eee05e2ea

commit 24fed4d3aa39f012328858ac38bc4c3eee05e2ea
Author:     Glen Barber <g...@freebsd.org>
AuthorDate: 2022-10-07 01:13:43 +0000
Commit:     Glen Barber <g...@freebsd.org>
CommitDate: 2022-10-07 01:13:43 +0000

    12.4: update stable/12 to -PRERELEASE to start the release cycle
    
    Approved by:    re (implicit)
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 Makefile.inc1           | 4 ++--
 Makefile.libcompat      | 6 +++---
 lib/clang/llvm.build.mk | 2 +-
 sys/conf/newvers.sh     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index fcffba095348..95f779e847f1 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -126,9 +126,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}-freebsd12.3
+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd12.4
 TARGET_ABI?=   unknown
-TARGET_TRIPLE?=        
${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd12.3
+TARGET_TRIPLE?=        
${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd12.4
 KNOWN_ARCHES?= aarch64/arm64 \
                amd64 \
                arm \
diff --git a/Makefile.libcompat b/Makefile.libcompat
index 6d403ed2503a..d1e9c862a69a 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -17,7 +17,7 @@ LIB32CPUFLAGS=        -march=${TARGET_CPUTYPE}
 .if ${WANT_COMPILER_TYPE} == gcc || \
     (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
 .else
-LIB32CPUFLAGS+=        -target x86_64-unknown-freebsd12.3
+LIB32CPUFLAGS+=        -target x86_64-unknown-freebsd12.4
 .endif
 LIB32CPUFLAGS+=        -m32
 LIB32WMAKEENV= MACHINE=i386 MACHINE_ARCH=i386 \
@@ -49,9 +49,9 @@ LIB32CPUFLAGS=        -march=${TARGET_CPUTYPE}
 .endif
 .else
 .if ${TARGET_ARCH:Mmips64el*} != ""
-LIB32CPUFLAGS=  -target mipsel-unknown-freebsd12.3
+LIB32CPUFLAGS=  -target mipsel-unknown-freebsd12.4
 .else
-LIB32CPUFLAGS=  -target mips-unknown-freebsd12.3
+LIB32CPUFLAGS=  -target mips-unknown-freebsd12.4
 .endif
 .endif
 LIB32CPUFLAGS+= -mabi=32
diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk
index 135d1c573eb6..1cd7b5f518cd 100644
--- a/lib/clang/llvm.build.mk
+++ b/lib/clang/llvm.build.mk
@@ -39,7 +39,7 @@ TARGET_ABI=   -gnueabi
 TARGET_ABI=
 .endif
 VENDOR=                unknown
-OS_VERSION=    freebsd12.3
+OS_VERSION=    freebsd12.4
 
 LLVM_TARGET_TRIPLE?=   
${MACHINE_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/sys/conf/newvers.sh b/sys/conf/newvers.sh
index e5a36c449643..15b11bff2fd2 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -48,8 +48,8 @@
 # upper case variables starting in column 1 are on one line w/o continuation.
 
 TYPE="FreeBSD"
-REVISION="12.3"
-BRANCH="STABLE"
+REVISION="12.4"
+BRANCH="PRERELEASE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
        BRANCH=${BRANCH_OVERRIDE}
 fi