From nobody Tue May 03 11:16:28 2022 X-Original-To: dev-commits-src-main@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 B52E01AB42A7; Tue, 3 May 2022 11:16:28 +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 4Ksy8D4jq7z4jkk; Tue, 3 May 2022 11:16:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651576588; 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=2JbvzqeGFRBGfMPukgOjSyCZbug5lzPDizrvexsBx38=; b=kpJZ4P3jGjvLfNFfHfQftoCQ3b6iyB+x/fJ6bKAjMdcNyil816F3iiTy3wfTYgOVrxIIau lCBnBG0xhx9daaOLqYVhl2vK87SQdw6YbKycrCmTtm5TDm4SwdkkLbXC85vUn1SM7mrhL5 /gcKcfslp61zqeiydhpLIoccKog2PNtfmj1GysoGBM4mLD6UiHTMn0tEQ4Te71HUkV3pV/ KCPFs1IpRYL2OYlnbxDLTjFmUdsQOcJai3ccl1kLvECDIDiEOAvi59zyUO1DSUFBj1HYfO 54X+AyN1RKQBmuKjRMyiB5YavuZEfb/xyIHE4JSyB6CsbDBk/Zn3Nyf7ilV2fw== 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 8172F1CE72; Tue, 3 May 2022 11:16:28 +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 243BGS3Y047744; Tue, 3 May 2022 11:16:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 243BGSpf047743; Tue, 3 May 2022 11:16:28 GMT (envelope-from git) Date: Tue, 3 May 2022 11:16:28 GMT Message-Id: <202205031116.243BGSpf047743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfredo Dal'Ava Junior" Subject: git: f9ee4156741a - main - build target triple variable from sys/conf/newvers.sh List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alfredo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9ee4156741a205c93ae947595b5c48717107d9e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651576588; 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=2JbvzqeGFRBGfMPukgOjSyCZbug5lzPDizrvexsBx38=; b=MkEtPyeK/CvxAOs61jeJfycgx5FDFzEYj/r6c7W5qI10minDdE0+CXOcRsh+u0ersY3f6j XqLM6p9/H9u8KXa1GMqgtmcG8VWg9FC0hrhiP0kZXS9mt87JJm71krTzbOMKhVYbO7qohf x6VjvbvcAARyaBiVei+eXY4Es8kk7fBLVhogodOSMMESHT5iliEf/ETw2y620FGeDjt18v YzFvxjt/CDl0KllTaxbCWT1zUF7xixuISDqW9OUpwF0BIeSTHcjE48FkUYZaBZf8vMUgdz 0eIPUD3bXVW5HLQaKIndi4rXzKfne60mNFVKg3SPalp3s4WneNUczW82o4YuLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651576588; a=rsa-sha256; cv=none; b=s7KMyHIqyTDWb5CnwoVJ6Citdu6/RCaeqj4Zps7TwUdPNUXYNv1TpkPITkGDTic82ZMe60 cX9NRv7KOmutU5X95W1OnUmTMnZ9tXrgM/rHkEKT2wdgrm1Za6wwzowQALsKSP6CksHk5B cprNVqzkM9ww65qAKnC1QbB5DIBJ6st8vdIEp9vN/zcAE+GDRRdSxBRSVZw22K1tCttEJ+ AdaaqvSck3+d+NrbbeqChyiR0SHFmUMAUdiXYJrtFYieWV2M4/mnZitN67dqQM6ANHaS/q RVRguKktc18KfdwsgsQ6BvSP4uuwIxSHuu5fhz8RPBJLvZhmI/5LWaFjRUncrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by alfredo: URL: https://cgit.FreeBSD.org/src/commit/?id=f9ee4156741a205c93ae947595b5c48717107d9e commit f9ee4156741a205c93ae947595b5c48717107d9e Author: Alfredo Dal'Ava Junior AuthorDate: 2022-05-03 11:09:38 +0000 Commit: Alfredo Dal'Ava Junior CommitDate: 2022-05-03 11:09:38 +0000 build target triple variable from sys/conf/newvers.sh Retrieve FreeBSD revision number directly from sys/conf/newvers.sh when building the compiler target triple value, avoiding manual intervention on other files every new release. Reviewed by: imp MFC after: 2 months Sponsored by: Instituto de Pesquisas Eldorado (eldorado.org.br) Differential Revision: https://reviews.freebsd.org/D34429 --- Makefile.inc1 | 4 ++-- lib/clang/llvm.build.mk | 9 ++++++--- share/mk/bsd.compat.mk | 4 ++-- share/mk/src.sys.env.mk | 5 +++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2b913e4e51f8..e3081594ec77 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -138,9 +138,9 @@ TARGET_ABI= gnueabi .endif .endif MACHINE_ABI?= unknown -MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//}-${MACHINE_ABI}-freebsd14.0 +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//}-${MACHINE_ABI}-freebsd${OS_REVISION} TARGET_ABI?= unknown -TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/sf$//}-${TARGET_ABI}-freebsd14.0 +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/sf$//}-${TARGET_ABI}-freebsd${OS_REVISION} KNOWN_ARCHES?= aarch64/arm64 \ amd64 \ armv6/arm \ diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index 5aff7081fb76..dd54bf7312d9 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -14,6 +14,10 @@ .error Please define SRCDIR before including this file .endif +.ifndef OS_REVISION +.error Please define OS_REVISION before including this file +.endif + .PATH: ${LLVM_BASE}/${SRCDIR} CFLAGS+= -I${SRCTOP}/lib/clang/include @@ -40,10 +44,9 @@ TARGET_ABI= -gnueabi TARGET_ABI= .endif VENDOR= unknown -OS_VERSION= freebsd14.0 -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} +LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_ABI} +LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION} CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\" CFLAGS+= -DLLVM_HOST_TRIPLE=\"${LLVM_BUILD_TRIPLE}\" diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 6a7d3d3c7e80..e99281775b84 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-freebsd14.0 +LIB32CPUFLAGS+= -target x86_64-unknown-freebsd${OS_REVISION} .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-freebsd14.0 +LIB32CPUFLAGS+= -target powerpc-unknown-freebsd${OS_REVISION} .endif LIB32_MACHINE= powerpc diff --git a/share/mk/src.sys.env.mk b/share/mk/src.sys.env.mk index 6f11489bfd2f..86f739414230 100644 --- a/share/mk/src.sys.env.mk +++ b/share/mk/src.sys.env.mk @@ -23,6 +23,11 @@ RELTOP?= ${RELDIR:C,[^/]+,..,g} RELOBJTOP?= ${RELTOP} RELSRCTOP?= ${RELTOP} +.if !defined(OS_REVISION) +OS_REVISION!=eval `sh ${SRCTOP}/sys/conf/newvers.sh -V REVISION` && echo $$REVISION || echo +.export OS_REVISION +.endif + # site customizations that do not depend on anything! # Save MAKEOBJDIRPREFIX and don't let src-env.conf modify it.