From nobody Fri Oct 07 01:14:20 2022 X-Original-To: dev-commits-src-all@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 4Mk9M10HFrz4dxWR; Fri, 7 Oct 2022 01:14:21 +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 4Mk9M06sqCz46DM; Fri, 7 Oct 2022 01:14:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665105261; 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=Tq6oyF60c6pAA7C7BW1Hf/ND7M1032pFWPjGkbqgWL0=; b=Ytlza2N6GyImN4GreZhqe111qF34gaNmI48eCpAH1yMZzTDrkdrg7kWN/QS5KwwrdGaXox FDS5tqNQjbFNPnPL0wbd4tabNhJzJUXvSp+oYI8aQl4d1H/eYlB8Wbod4pcKkCTkoJzFoR eo6lGgFgH8iyjCyeeA2kJgIjSsMMm1XTXOPnpv7xPJIDYu7KRJHyntHgO9/GbnA/V60Vr4 LqLo3CkFgadgrGDk6hbM1F79CrJAkvLM1YsC2PGI+KOrlzx5FVHtR0/zNta9B9RvkTR9Cg tR2BSXDrCTAqDWQiuPzq8oDrBq36hKWiQ4k8AKAVT4u3tioQayfLLyBPwtF8Tg== 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 4Mk9M05bpCzRCq; Fri, 7 Oct 2022 01:14:20 +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 2971EKa9091214; Fri, 7 Oct 2022 01:14:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2971EKn4091213; Fri, 7 Oct 2022 01:14:20 GMT (envelope-from git) Date: Fri, 7 Oct 2022 01:14:20 GMT Message-Id: <202210070114.2971EKn4091213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 24fed4d3aa39 - stable/12 - 12.4: update stable/12 to -PRERELEASE to start the release cycle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 24fed4d3aa39f012328858ac38bc4c3eee05e2ea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665105261; 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=Tq6oyF60c6pAA7C7BW1Hf/ND7M1032pFWPjGkbqgWL0=; b=ONWcAYJYyKIwgolbJuxFbCJ4Nh0sOYhH9Wf/0yhZLSvyrbJSHT5iNkY/Pv/Vt2pOJ+2h5R ytNovsVhKCeXWSIa7LQ6mp9Rf5cYmZJsWl3GF1qWlsRfGV6owWT6XFuxYJMUgLczFP7r0U Z2b6wp8gnUbSDAKhlXjVrbOpEGUhV1h8CZH6B8ErTG2TfxUY32JOnP3WFo601R42fbC4AH sFSe+nW1NuUyRF8qnqeGIVNIeWzi1kUzGfJHq9IS0vMDMdaQlu+9KpMfgodzAs9CEWCJEq /tJh8bPliTAvF516uOCgFJa6TSukX7siHmIvSRjRjIsLSTcQ+1PFjnrMGXbQJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665105261; a=rsa-sha256; cv=none; b=idm4B6BAyzhU1W8Og1w3WV6emNiXwXrf9KfU++ROw0YjtK8V6M2uf05a5OWDntP6ADV5ZV 9VjARlu0vUl84PtZ61yAHkf8qzm/8oRGEhCFlt1k75AGFXM+cdI4YRDy1IkUWXB7jw6Wxm agcFpR6qv4qsMyMPa94NeInxbBrJYodMU1ybNSK9vx+JCXRHLhoEEfX5tAUYG2f7if+/oe n6/0jBotGNtsnygp6idKnVEco55K0EntgRXNSng9c9CD+hUDl1aW2LbZKESVDgM4HwXb1o cQK9Pss2gtV9Wd6fk0MU+s2k1ZhIstTBHANmlCLbjRqRZFHGYEx+N+QkFzgYsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=24fed4d3aa39f012328858ac38bc4c3eee05e2ea commit 24fed4d3aa39f012328858ac38bc4c3eee05e2ea Author: Glen Barber AuthorDate: 2022-10-07 01:13:43 +0000 Commit: Glen Barber 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