From nobody Sat Jan 28 01:00:08 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P3bhS2WHsz3bSrH; Sat, 28 Jan 2023 01:00:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P3bhS21clz3j44; Sat, 28 Jan 2023 01:00:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674867608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q78OtBtcUlZOrxEGWrgB1zAgHqikUTkS999ZH5oFr3I=; b=YzMQb82KPfRrhyBymLhhCi1rieGOkOf8ZBRlX4bq1pD++TC7lPtZ84fNkDgjMn5w6zd+Qf m4AqfsTdG2RjOCdcYrONmm5K2nGZDI3UcMODqIl5f52jPN65dN1S0zxJNvc6sZkB/k19tU FaYDw+gf3D795qL7jV5ANSGSeOVTGjvhGUrEscscyb51qWv1bXQURgNgqns469yzHqX16A JO1uzwHTRxbkHCb2VM2ekB0RhE7UlUpZR2L8orh50coYFlGHntTLdHu8Ba7JFw9AsO0ikw x+g2DkNrsDf/JwFLW6f2RLoBgNlniDDTzaVgBP16FidGxbaHZlzKc/CZRTTNtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674867608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q78OtBtcUlZOrxEGWrgB1zAgHqikUTkS999ZH5oFr3I=; b=GgGadEXTwrQ7IRaeYXvK3XwRqhsz0PsJ0kbIAbgWFSQcKO92CQoWz6xwq93YtWUeglMKYB TKxzrDF2A2ExRfSITOUB4CsA34bX2DoKKGSDKZTopbLGWkSRgZAu5AVjgOmkMedvI422wy qjP89iRgYZnYOyGt1q1xuc2TMovTeSQVlCf928TNQ+JFOwAf0Rs9vN0uanc3QE0RCSfjmR fXJQpQ3LuS+gtOorSCbv117ZfUuGxRaD/LkszjSu11p1j4MvMCQqEvNOZ5U/sw+X4EFllV oQlXia1HAtDvbVT1gZ8ZcSQigy4f4LbhDjFAdt9fSeYgEPv2ea+aixIZ3mByQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674867608; a=rsa-sha256; cv=none; b=f4oHRj8JcuDjuYLB1PVGITLkTwe4cybFfS0Zw7dOAgUYWqoopUpBAI99xOJ8hll+xaP89g tliTJaiVZU02TAD0MOy2lupE2tw9dIHI9DykWFUXK27Vt0OExdCzjFtVHkQ0JE0F19H3xF zllnskc6r5k+dKcIMTPx0vmexAXZlpwg3ZL2RlehdTxV3sckosLD6ShOCIsQAPCpM0Wr4w H9gnKBKP9iYY+fnrXpjgC7xegT9MOGKywq/djkeppxgQVWh9doBGmFKDzhsgMCU/Ro0IzF vqShm102FJYkJo6Q7/Ldb6AEhb2dB20a7g2Xn54weDxhdtPTQPJ/W16hmWTKOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P3bhS14t0zVQx; Sat, 28 Jan 2023 01:00:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30S108g7003198; Sat, 28 Jan 2023 01:00:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30S108rC003195; Sat, 28 Jan 2023 01:00:08 GMT (envelope-from git) Date: Sat, 28 Jan 2023 01:00:08 GMT Message-Id: <202301280100.30S108rC003195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 3ec68505d6b9 - stable/13 - 13.2: update stable/13 to -PRERELEASE to start the release cycle List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ec68505d6b9e001c7f29b077a60978375fe4035 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3ec68505d6b9e001c7f29b077a60978375fe4035 commit 3ec68505d6b9e001c7f29b077a60978375fe4035 Author: Colin Percival AuthorDate: 2023-01-28 00:59:24 +0000 Commit: Colin Percival CommitDate: 2023-01-28 00:59:24 +0000 13.2: update stable/13 to -PRERELEASE to start the release cycle Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva --- 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 f98bb58ab2f6..6975ce7d843f 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.1 +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${MACHINE_ABI}-freebsd13.2 TARGET_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.1 +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${TARGET_ABI}-freebsd13.2 KNOWN_ARCHES?= aarch64/arm64 \ amd64 \ armv6/arm \ diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index 79621d706c6b..bcb46ae2fc5c 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -44,7 +44,7 @@ TARGET_ABI= -gnueabi TARGET_ABI= .endif VENDOR= unknown -OS_VERSION= freebsd13.1 +OS_VERSION= freebsd13.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} diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 45a8a8c48967..0102664d0f86 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.1 +LIB32CPUFLAGS+= -target x86_64-unknown-freebsd13.2 .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.1 +LIB32CPUFLAGS+= -target powerpc-unknown-freebsd13.2 .endif LIB32_MACHINE= powerpc @@ -69,9 +69,9 @@ LIB32CPUFLAGS= -march=${COMPAT_CPUTYPE} .endif .else .if ${COMPAT_ARCH:Mmips64el*} != "" -LIB32CPUFLAGS= -target mipsel-unknown-freebsd13.1 +LIB32CPUFLAGS= -target mipsel-unknown-freebsd13.2 .else -LIB32CPUFLAGS= -target mips-unknown-freebsd13.1 +LIB32CPUFLAGS= -target mips-unknown-freebsd13.2 .endif .endif LIB32CPUFLAGS+= -mabi=32 diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 48320ce1b7c3..14315302ed2d 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,8 +53,8 @@ # TYPE="FreeBSD" -REVISION="13.1" -BRANCH="STABLE" +REVISION="13.2" +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 649ca3895c75..cff3a544de22 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.1" +#define SYSTEM_NAME "freebsd13.2" /* "Define to 1 if you want to use dbmalloc for testing." */ /* #undef USE_DBMALLOC */