svn commit: r364897 - in stable/12: . lib/clang sys/conf

[Glen Barber]

Author: gjb
Date: Fri Aug 28 00:00:37 2020
New Revision: 364897
URL: https://svnweb.freebsd.org/changeset/base/364897

Log:
  Rename stable/12 to 12.2-PRERELEASE, marking the start of the
  12.2 release cycle.
  
  Approved by:	re (implicit)
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

Modified:
  stable/12/Makefile.inc1
  stable/12/Makefile.libcompat
  stable/12/lib/clang/llvm.build.mk
  stable/12/sys/conf/newvers.sh

Modified: stable/12/Makefile.inc1
==============================================================================
--- stable/12/Makefile.inc1	Thu Aug 27 23:57:30 2020	(r364896)
+++ stable/12/Makefile.inc1	Fri Aug 28 00:00:37 2020	(r364897)
@@ -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.1
+MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd12.2
 TARGET_ABI?=	unknown
-TARGET_TRIPLE?=	${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd12.1
+TARGET_TRIPLE?=	${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd12.2
 KNOWN_ARCHES?=	aarch64/arm64 \
 		amd64 \
 		arm \

Modified: stable/12/Makefile.libcompat
==============================================================================
--- stable/12/Makefile.libcompat	Thu Aug 27 23:57:30 2020	(r364896)
+++ stable/12/Makefile.libcompat	Fri Aug 28 00:00:37 2020	(r364897)
@@ -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.1
+LIB32CPUFLAGS+=	-target x86_64-unknown-freebsd12.2
 .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.1
+LIB32CPUFLAGS=  -target mipsel-unknown-freebsd12.2
 .else
-LIB32CPUFLAGS=  -target mips-unknown-freebsd12.1
+LIB32CPUFLAGS=  -target mips-unknown-freebsd12.2
 .endif
 .endif
 LIB32CPUFLAGS+= -mabi=32

Modified: stable/12/lib/clang/llvm.build.mk
==============================================================================
--- stable/12/lib/clang/llvm.build.mk	Thu Aug 27 23:57:30 2020	(r364896)
+++ stable/12/lib/clang/llvm.build.mk	Fri Aug 28 00:00:37 2020	(r364897)
@@ -40,7 +40,7 @@ TARGET_ABI=	-gnueabi
 TARGET_ABI=
 .endif
 VENDOR=		unknown
-OS_VERSION=	freebsd12.1
+OS_VERSION=	freebsd12.2
 
 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}

Modified: stable/12/sys/conf/newvers.sh
==============================================================================
--- stable/12/sys/conf/newvers.sh	Thu Aug 27 23:57:30 2020	(r364896)
+++ stable/12/sys/conf/newvers.sh	Fri Aug 28 00:00:37 2020	(r364897)
@@ -48,8 +48,8 @@
 # upper case variables starting in column 1 are on one line w/o continuation.
 
 TYPE="FreeBSD"
-REVISION="12.1"
-BRANCH=${BRANCH_OVERRIDE:-STABLE}
+REVISION="12.2"
+BRANCH=${BRANCH_OVERRIDE:-PRERELEASE}
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"