From nobody Wed Oct 05 16:29:41 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 4MjKm618fGz4V8Tr; Wed, 5 Oct 2022 16:29:42 +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 4MjKm572YGz3mcx; Wed, 5 Oct 2022 16:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664987382; 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=njX2QlEvgTozzA/eORIC56qf3LpR70AQgHcA7jO1Z0Q=; b=n53GCFIJViG6BddfODVdH0sr6FepndN7e/IvwghuIydCYbCewJtAG89GNhglyr1wDJcEur dIx9mBHqqDmg+8FAexBlADXZXUcvBf9PfzmadoQeGf0yHsg3RhsmauztZuOry+T46xvvkJ THFmRtUoB6NsTf628mJ3wCdw4uJb//F0L53npTvSxinkp/xMie5aibp9Vi3I6I2WB6Wu5N MBVBlzGg4UGj8+oh4tdsKa/PcX4vvnMNXgfBw5TOarEVdSCbKwUEFwu1CRhWL7/mrhPRHU gdE+nzZ0DyMfZdzhzCI0+01C6tsmFWzTzDI0C6X5htn00X/CjiT6WQr/J1Zt/A== 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 4MjKm55rjRzxxW; Wed, 5 Oct 2022 16:29:41 +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 295GTfg7041005; Wed, 5 Oct 2022 16:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 295GTfLZ041004; Wed, 5 Oct 2022 16:29:41 GMT (envelope-from git) Date: Wed, 5 Oct 2022 16:29:41 GMT Message-Id: <202210051629.295GTfLZ041004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 77becb932575 - main - Rename MACHINE_ABI and TARGET_ABI 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77becb93257550ffab0fc9411f95a89167603188 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664987382; 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=njX2QlEvgTozzA/eORIC56qf3LpR70AQgHcA7jO1Z0Q=; b=S/U30fzbeIVbRBh3TeCQ47kpRd/BBU4aOpxVQV+DaB4GnTwRi764o2wJjZ6yui4LiQ2NX3 lG0jU5ZoWyR+JZOjzayo3kZyRyCCSWXl1D4RTDp5wCsM2qzNVmEJbVdqVRdbVF2RLZK2T5 QDai1pk4WuQfRijCK14uKUw6f86Mk1amzrmXyEcer65kmbC9Z4DnEtpOnfzCKptdOvVgOi aNXoEw+792XC/5BJYXt0SDRN5B59hg7i/28iXkRlO8x5p5KQ32u1+3hm7FiGDm4yNKiCs+ ntvLSzS74ceN7/EwfJlmpPlTL6lC/tQmTX/thxCA1e9J1tSEHGPKMl8/iobo+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664987382; a=rsa-sha256; cv=none; b=XJJe5hEt4wAveVkl8loIYtfg6I7paHstr66ZcJhD97GPwBCYy48ihyWWe/87WrS6atSrQd f/e0b0iMksdLW4dyigtgooKVC7tE94WFyZY8eIScz9EKvLWOyyawT2NNyHjl+i/InsNrZ5 BX2SrEbBb05lq0nM0PwssnP5lir/V7zff/mUC4Jbajyel3KcnegaWiYxI2dW7GHcsYKPtO je4Ax2h07Ik2ZvCoCLSYswNP/oy1pWWxa2T6fAd939bvG3QIcHBlQlCRG4N/fccP1WslNz mv4Xz18o/DBDzOqjzH0fDoZJr0Oa+7n08VN1lPUA1ZQaDCoupUj7nmRSS2w9Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=77becb93257550ffab0fc9411f95a89167603188 commit 77becb93257550ffab0fc9411f95a89167603188 Author: Brooks Davis AuthorDate: 2022-10-05 16:26:30 +0000 Commit: Brooks Davis CommitDate: 2022-10-05 16:27:44 +0000 Rename MACHINE_ABI and TARGET_ABI The MACHINE_ABI and TARGET_ABI variables are used to set the middle of the target triple (e.g., "-unknown-" or "-gnueabihf-"). They are not set by any tool in the base system and I've only found the latter mentioned in one review online. As such, rename them to to MACHINE_TRIPLE_ABI and TARGET_TRIPLE_ABI to clear the way to use MACHINE_ABI as a supplement to MACHINE_CPU, etc. Reviewed by: imp, jhb Obtained from: CheriBSD Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D36420 --- Makefile.inc1 | 12 ++++++------ lib/clang/llvm.build.mk | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 63e9b574eaaa..03f98b641911 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -132,15 +132,15 @@ _TARGET_CPUTYPE=dummy .endif .if ${TARGET} == "arm" .if ${TARGET_ARCH:Marmv[67]*} != "" && ${TARGET_CPUTYPE:M*soft*} == "" -TARGET_ABI= gnueabihf +TARGET_TRIPLE_ABI= gnueabihf .else -TARGET_ABI= gnueabi +TARGET_TRIPLE_ABI= gnueabi .endif .endif -MACHINE_ABI?= unknown -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}-freebsd${OS_REVISION} +MACHINE_TRIPLE_ABI?= unknown +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//}-${MACHINE_TRIPLE_ABI}-freebsd${OS_REVISION} +TARGET_TRIPLE_ABI?= unknown +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/:C/sf$//}-${TARGET_TRIPLE_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 7fe279078397..cd8b523cb423 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -36,15 +36,15 @@ BUILD_ARCH?= ${MACHINE_ARCH} # 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*} == "") -TARGET_ABI= -gnueabihf +TARGET_TRIPLE_ABI= -gnueabihf .elif ${MACHINE_ARCH:Marm*} -TARGET_ABI= -gnueabi +TARGET_TRIPLE_ABI= -gnueabi .else -TARGET_ABI= +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_ABI} +LLVM_TARGET_TRIPLE?= ${MACHINE_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}\"