From nobody Fri Oct 14 03:04:59 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 4MpWTR3MV3z4fN11; Fri, 14 Oct 2022 03:04:59 +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 4MpWTR2rbJz3HWR; Fri, 14 Oct 2022 03:04:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665716699; 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=nBJqyJu6W8YsMUDOGwsucTt6yvGQJixx8A4MW/u2CaQ=; b=hQIVbk0igIZuziuQNfAFeQ5U/A6fdYohMhxJvm5M8SdiNzEV8OceeTHBIdSC56IUyrzIOB ulkNbkpmHt9NN4UBGmk2Ho4IQgcW3Z2nllVBL5yXrOUkK9Eat4/lYfN9VEq+BdRnE/hcz5 Ut34rsR0hXFS2mItwJocrXl8lz+erzW3/KWHKDjL3GaC48+LzOADVbbfSobXYAPCoyTTcW G7NoqgmEgacSpg5Vxl9ifKAqrxC7Yl48ZcEPpPPqOiWUlrWfA5W5dweF2eNUSDjypURjM6 pBrm9TP8V1BNZK7ajqkIpRcotk9fv8lpFdg6bMoc/mcldx62Sofx+NHi/7Zf7w== 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 4MpWTR1vwdzdkp; Fri, 14 Oct 2022 03:04:59 +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 29E34x6X069601; Fri, 14 Oct 2022 03:04:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29E34xVv069595; Fri, 14 Oct 2022 03:04:59 GMT (envelope-from git) Date: Fri, 14 Oct 2022 03:04:59 GMT Message-Id: <202210140304.29E34xVv069595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: ed7910fbac07 - main - Revert "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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed7910fbac07ee39d10528994e49ada2d0f2d754 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665716699; 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=nBJqyJu6W8YsMUDOGwsucTt6yvGQJixx8A4MW/u2CaQ=; b=HewaxZKz/MjrH+hkMy81Iggcw89Yq+IrkM2rzJvlbFahXKhpQHmJt+eCz4dNa7TMUXvWkY 3C0LE1Eu5IZxGtzmPLENGvYW9qNVpjpKDCkQSb3BHfFoLfYfVYwD5axpmwqHzJlYi88FYm Xvin4ivhxmlj4eqJFq9sqgpcSwUrV4uv4Np/giPU4IeoSIOqmAgkZwit20NqugXpI4qtkE 7bZlyDZ6EhBEkZhYa1/mRutM5lt3LdRngW1j0bXWLc0rGwbkM7CLlOEg4VtKEGQZ5CEzB0 RfvLiKL5tjwhVw/NgqtQICptSRUjMTlK5iToJVLQ4teQgd1ih56bW/iIqDiFXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665716699; a=rsa-sha256; cv=none; b=PjpCa9mWN96oa/gs95NHaN4PBYcuPUfFyt1tTbhvbpraVj0eOXOH02QMk+4X0Vl0QghXFj x1++MHExEvT5nLydmGN7J02he/TWi+lk4dHN7e9kIBYsRifq84skzG3VIbQtJbHeUsWSVW 63PruSzz+rCydQuwjS0NOri5Zx5h74+jzqakUyo1XuCgLjXsMeHncgLzRznrN3QpRyjCdn iEpSDOyaUAJtgqlCnAt3Tqkq9EmQBDq0/gk4TsKLD8PVM5Xovy+0AJ96RTWNXbaTCq7ZjE 9QtPWFqQpGqZnPIUizqHn1hFowOK69XS8CLHSOQgOQhDYtCIsdDitqof6tf62w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ed7910fbac07ee39d10528994e49ada2d0f2d754 commit ed7910fbac07ee39d10528994e49ada2d0f2d754 Author: Kyle Evans AuthorDate: 2022-10-14 03:04:47 +0000 Commit: Kyle Evans CommitDate: 2022-10-14 03:04:47 +0000 Revert "Avoid using TARGET_ARCH in llvm.build.mk" This reverts commit 8534e6be8110a8126268a38dc0557a2d15615ce9, and adds a cautionary note that there are dragons about that should be considered when changing it. PR: 267026 Reviewed by: dim, imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D36981 --- lib/clang/llvm.build.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index cd8b523cb423..575b6b2d9c62 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -30,21 +30,26 @@ CFLAGS+= -DHAVE_VCS_VERSION_INC CFLAGS+= -DNDEBUG .endif +# Note that using TARGET_ARCH here is essential for a functional native-xtools +# build! For native-xtools, we're building binaries that will work on the +# *host* machine (MACHINE_ARCH), but they should default to producing binaries +# for the *target* machine (TARGET_ARCH). +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 ${MACHINE_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") +.if ${TARGET_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") TARGET_TRIPLE_ABI= -gnueabihf -.elif ${MACHINE_ARCH:Marm*} +.elif ${TARGET_ARCH:Marm*} TARGET_TRIPLE_ABI= -gnueabi .else TARGET_TRIPLE_ABI= .endif VENDOR= unknown -LLVM_TARGET_TRIPLE?= ${MACHINE_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} +LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_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}\"