From nobody Sun Aug 14 11:15:52 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 4M5FG100MGz4Yly5; Sun, 14 Aug 2022 11:15:52 +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 4M5FG06d8tz42MX; Sun, 14 Aug 2022 11:15:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660475752; 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=vo3EskV8kFNwleU+mucAQHoN3V1/AzYGlZ9/b1bEQrQ=; b=qx23MWiXw7buFpSUAQE8vNl77j9F5lFVbNOs1yhu8kwo/XrzDM/zdwIhTmAhZaViK6t2TO iPAUjU/84jtagn3QfiMMmx1qW5lXjzFUzvMm/s46NgGRrGWTEHFBYspl1Pt8AMRgYhSsXB 1MxLw57iBqq3wNW+EL+zyHRuE1ac3/aTKiHapo/HGu6cEIekDuA6Ob0TNDqjBvq0S2J8Vx 9fp0ga889rhqEDdRkM4inP65EPFrkR5hx1WnwT0ruiOAwkqLV6/3x/PUpcvA62oQA1ulFZ BzK+pbMxcylUHBbfuDwZxcbiC79pvzsuTOpyM8m2NWvwHdgFvO5YBaere0A5pA== 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 4M5FG05cPJzpDQ; Sun, 14 Aug 2022 11:15:52 +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 27EBFqQ9053969; Sun, 14 Aug 2022 11:15:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27EBFqFf053968; Sun, 14 Aug 2022 11:15:52 GMT (envelope-from git) Date: Sun, 14 Aug 2022 11:15:52 GMT Message-Id: <202208141115.27EBFqFf053968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 8534e6be8110 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 8534e6be8110a8126268a38dc0557a2d15615ce9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660475752; 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=vo3EskV8kFNwleU+mucAQHoN3V1/AzYGlZ9/b1bEQrQ=; b=sD4+SdrrVeY3daB1d2eS1vEW2hjpyEai4mJr4T+AdeHNlLSiNMINSeErgxl2tCR1k7v01o tlFeaVDQ2+AKvCSLFqM6b57pnVrqV2k35uHRI3QRB52yaU2LRHjCB+xdE18JpUwlt6qeg/ QSRMmzUJ4I65xxRqh7+0GX1l7KeOXa1guJvDySPg+AesjPP1uwqGhqTZJu+ul+tbG1cRR+ 0P8E3RCOUxxsd4hphHr8Z5h163zEBhx+hFZ1zqdXlennLGvtWLMppjt5M6FKG3ki3psS/v ZUGyQj0+48nN9ucyC9oM/2aUAv/h0h5BLGSiSLLfcZuRg5PzGAbg4aZua0ubOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660475752; a=rsa-sha256; cv=none; b=vTmw0hFy3ORj1QPnnjsYtoyb+J8vOus5xNhj62extWPi3s11Ntkpg2FkwrtZ2d9Bzosvqy nI0Zl/rrsrfV0xmVon+HVQVc7dTLH3um2tLhLWNJsYaVJgmdJo6VjYg3OidMUxpIu0T9PR kKnQ6W0e368cGBpEoqclHPJvJs4mNdEUwWBCGpo/BjEDVhFTl9t3zeGqsfDoHRgUXve72F N0uRU3WOZynDmBA3xKXpaH/EGzCWd3tjzgnFUPx8o318JhsaHqSQn3hZbkpg/K/GnpcHHu FhcavWuQFJ5Eat8B91zl2BogQrBQGSJRkZWoeXIXGCrnHfObvaZPXSSHMGbfyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8534e6be8110a8126268a38dc0557a2d15615ce9 commit 8534e6be8110a8126268a38dc0557a2d15615ce9 Author: Dimitry Andric AuthorDate: 2022-08-14 11:10:48 +0000 Commit: Dimitry Andric CommitDate: 2022-08-14 11:11:52 +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 --- 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 dd54bf7312d9..7fe279078397 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -30,22 +30,21 @@ 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= .endif VENDOR= unknown -LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/[hs]f$//:S/mipsn32/mips64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_ABI} +LLVM_TARGET_TRIPLE?= ${MACHINE_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}\"