From nobody Sun Aug 21 11:29:29 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 4M9YDT4x43z4ZYgF; Sun, 21 Aug 2022 11:29:29 +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 4M9YDT4NfHz3ydD; Sun, 21 Aug 2022 11:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661081369; 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=ln3l5bKFQetpirlZfmB0yZYBAhlrRENDdNEaGuB42JQ=; b=fB3VoO9kHhbwlLsCvwAu64BtoQWkQlYo/GR3WqEHq3srMybk/BWY07rjwme2ukV2IbvQBu WYT/imo1w9GoVKGJLPeFmY7sy8ZcmKQ0fhaEM6WeLXSewhdhMz+Nf632rhNRJ/sTovTUWY /aVCO3V0gvBj05xKvoEjUVjE4AqvPcXS3CR2E9PYHLnL6jGcitzjsQMyabLDYlKJQC6Z5P w2w2DjZiwaT+Dj+tgh8EKxUCfEs27yBHbnExA+iVHBkxmdGTcsidZemJNf83a/Y+r2TZ7H T/lSh300K5GEXjlpw0xwEXDpijgMHX9ccCj27qejginAkJ7TiR3e78OAuL/m5w== 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 4M9YDT3RGfz18By; Sun, 21 Aug 2022 11:29:29 +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 27LBTTR6004955; Sun, 21 Aug 2022 11:29:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27LBTTlR004954; Sun, 21 Aug 2022 11:29:29 GMT (envelope-from git) Date: Sun, 21 Aug 2022 11:29:29 GMT Message-Id: <202208211129.27LBTTlR004954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 0e33cf79a008 - stable/12 - Avoid using TARGET_ARCH in llvm.build.mk 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0e33cf79a00883689c7ef04194dc68c046f3f718 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661081369; 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=ln3l5bKFQetpirlZfmB0yZYBAhlrRENDdNEaGuB42JQ=; b=oILh2ck9AtWkJz4Gp1Rb1ypMQzq4N0FP915mfoNerBQc9dRVB3gCTZdIdLKAkzaVdUutec 4G1b6ruK0z2y3+RPTRH7woAjTtsiWJ2b+z/lIcwCkXvvBFNcdKTLdaWVuy6lghexKLVUnv MIMoIlhlbYXT5NtcjUNsRtoEASdv4EW120Fg6N0sA+Uv77Br/lbIU8XrXDKCQ0WsQYeAWw cdWyF0C10TVc2nBGWNwDxW2Cj44N8JylvlFm2AlivF0np2Ekvxe4kv5kQzAKhoRzCsTlyr Jj9ep6PptxTX4EjFHDCk9dYlUn9xseZPYalQYIHVFQtG5K93wD3IRBEna76ptA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661081369; a=rsa-sha256; cv=none; b=PPeK1PF4P2lt2WQRCGFKH63vg8F5SvUKVRwtbwQokMaAqt/EtgKr+zzu6anC6GfQ8eT2op qERtU4FWoVyGKhMDmi4eWnGZnqfbYs+pVoukX0YZOFwUpKSE0EZqa0kYFTyw/Uzgfnjgcl nHQ5Bv2c9i3wbOCoIacabWYRCD5gFDCP3yADlUOznm51rJSr9QvxfdcOOITokRFVy3Oi2J vLKbepw7UXusbDMxYk03J9r9oQsmMcak96IsMCyLAXCol4UuaShaMBXQrFPdQVpXFH6eDR HuyzctNMAXFbnUhF7U4W+DqbZ9IllXS0ZDMbJqXlpL986uHn4C82ZyMd/Cud3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=0e33cf79a00883689c7ef04194dc68c046f3f718 commit 0e33cf79a00883689c7ef04194dc68c046f3f718 Author: Dimitry Andric AuthorDate: 2022-08-14 11:10:48 +0000 Commit: Dimitry Andric CommitDate: 2022-08-21 11:17:41 +0000 Avoid using TARGET_ARCH in llvm.build.mk Apparently the TARGET_ARCH macro is not supposed to be used outside of the top-level Makefiles. Directly use MACHINE_ARCH instead. Noticed by: imp, jrtc27 MFC after: 1 week (cherry picked from commit 8534e6be8110a8126268a38dc0557a2d15615ce9) --- lib/clang/llvm.build.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index dd1d5068efda..135d1c573eb6 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -26,15 +26,14 @@ CFLAGS+= -DHAVE_VCS_VERSION_INC CFLAGS+= -DNDEBUG .endif -TARGET_ARCH?= ${MACHINE_ARCH} BUILD_ARCH?= ${MACHINE_ARCH} # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it. # arm (for armv4 and armv5 CPUs) always uses the soft float ABI. # For all other targets, we stick with 'unknown'. -.if ${TARGET_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") +.if ${MACHINE_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") TARGET_ABI= -gnueabihf -.elif ${TARGET_ARCH:Marm*} +.elif ${MACHINE_ARCH:Marm*} TARGET_ABI= -gnueabi .else TARGET_ABI= @@ -42,7 +41,7 @@ TARGET_ABI= VENDOR= unknown OS_VERSION= freebsd12.3 -LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-${OS_VERSION}${TARGET_ABI} +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} CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\"