From nobody Tue Aug 15 19:11:43 2023 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 4RQLV74h0Tz4qJR3; Tue, 15 Aug 2023 19:11:43 +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 4RQLV74DY7z3P0q; Tue, 15 Aug 2023 19:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692126703; 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=TIF/eNQl51k+e87nQOeXMpdkNdzTedjm2eixU3NUNcQ=; b=KWS6uGjJVk+SWcPkNkA02GH2H6UWE4a/eCi4JH0K9g5RAlFcAXBBdJmvzfYvkWUjsgz5R5 d6Ug0AiyKgFroGCXsV+vJ7NdrN1X/zbU0uXrKbGTqcSiRLkZeLuyGMbVrOkY9BgSvfjO/4 VGYs/0LspoURv3WTYCgjm422Kh4d2FCcGVxNeXPuqUEObmUDBLe/Pi6DHFtr00UFwPbaqu 3fY3RjAplvkO9lnjiYKOSSbIy/5aQGW/HxL6LISngOtg4WNT58nBnu2ItoHnLpxGT1au4U j1UTp+XrV1VXHrDNQxWQR99CMa86UwkzwTMm4MSX4YLbtfbdXqcItZ4WmcIMcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692126703; 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=TIF/eNQl51k+e87nQOeXMpdkNdzTedjm2eixU3NUNcQ=; b=T4QsMxqar8/P9suH59gqRR7oPnp/C2xlaemTWFQlo9Gq/2OKYHAAnw7HVw81phOSiAGnS/ eGVQwb1yncNzklACdESGGJzn1p0GtDRKXMHIGjqHMyUWLJTLW7QTf9ygEfgGXZq4XFAf32 b7OiRZJciQ3XjOAjU4rkLWhrQTISEcNQdxM7KZCcAV0lGjcfotlnmHo7d2ZAoGA4SE5GIK KjLCa7RKaCnChpFrZZUVrky82/MixEbq9xS4ieJOIF3vZ4xutY41lYO39ZACa33rC65KzU n9FKb61YEKgKCPd9uqa6Nxrx3C0LnHWTl0e1BeVEqF5+W6j8cVf0JpfISo0KUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692126703; a=rsa-sha256; cv=none; b=fhzACjoZCADtpQSvGFVN1SyY157/vbHiyPTHQ4W7L2NsY0GKDaZPI3Qr8GyGzBtS26a1ph km+EzcgfU9i1fDWYmrejDfLs3+Hx/AkO1B+g7N5N4w2gzAzosn9ESqfdRbNn/QZMepxeas 4BIRQO9q0R09yoCGcSPNlqcdQOMye96zyzkMRpeELnsU2Vxrbw9diGJVqk4W6xB4y8eQEF hIwae0Cyr3J5PYrLF15CaSok+sB45CIYUH1UjEOsRgPawnY6avVxQksvSCPFoNfevKYqo1 5Z0ZJbH7XElyQYb5a1x07vkoDGmsraSW6WwatuYSsrD7QhFffirtryHGFwHKqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQLV73HcKz6wX; Tue, 15 Aug 2023 19:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FJBhqk089119; Tue, 15 Aug 2023 19:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FJBhcT089116; Tue, 15 Aug 2023 19:11:43 GMT (envelope-from git) Date: Tue, 15 Aug 2023 19:11:43 GMT Message-Id: <202308151911.37FJBhcT089116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 43b41bee90c7 - main - llvm: fix armv[67] after 0bc26e325450 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43b41bee90c711ba47a507e2df14915b7a1ae228 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=43b41bee90c711ba47a507e2df14915b7a1ae228 commit 43b41bee90c711ba47a507e2df14915b7a1ae228 Author: Warner Losh AuthorDate: 2023-08-15 19:08:39 +0000 Commit: Warner Losh CommitDate: 2023-08-15 19:11:06 +0000 llvm: fix armv[67] after 0bc26e325450 During the life-cycle of the patch that landed as 0bc26e325450, the variable names changed and I missed that in the rebase. Use the proper TARGET_TRIPLE_ABI. Fixes: 0bc26e325450 Sponsored by: Netflix --- lib/clang/llvm.build.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index f9fd62e78f4e..a2f5a5a4c341 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -41,9 +41,9 @@ BUILD_ARCH?= ${MACHINE_ARCH} # For all other targets, we stick with 'unknown'. .if ${TARGET_ARCH:Marm*} .if !defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "" -TARGET_ABI= -gnueabihf +TARGET_TRIPLE_ABI=-gnueabihf .else -TARGET_ABI= -gnueabi +TARGET_TRIPLE_ABI=-gnueabi .endif .else TARGET_TRIPLE_ABI=