From nobody Wed Apr 12 18:33:23 2023 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 4PxWYc0jPMz44Vdp; Wed, 12 Apr 2023 18:33:24 +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 4PxWYb26cWz4CZs; Wed, 12 Apr 2023 18:33:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681324403; 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=i12D4xkfXIYBgzYcHLPkcdhXD8qbdZl9pNA8uEHcgrE=; b=QHfiyxG19lhJKPuX6P4bQZ/HJQj/ish32sJG417NtICv80cu3SXlOQjnGiPg+BpMbTV85Z ZFFC8tffKezQZaEahuYPyHt+i4UrgnRpFI1o55KPqz72BAeo3R6WwI71+gBxz+HM0S8Hht pQnbqvVJZ4VrtnvP1j43vwkl9OHIAVPQjjLoo2WNmXXqw/h04EvktKJpkrCoZuFhRAwN+r 4852bvDm+Bjg9FzpBbXUSFq0VbLN/tagKN9FaxNsTHXOXadr0T64kBdpNqtgMenav1hWnc ZTho0J3m2iIQWHc4GlGmWad9UruJHzgBHDxpWZyX5S56JmIjdWZVIqnDuofC7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681324403; 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=i12D4xkfXIYBgzYcHLPkcdhXD8qbdZl9pNA8uEHcgrE=; b=RAW4U7nFYqr8QL7dsYY0YRi73KdFWoFyqXJRXdoctwU3/7XD8mVGOVKo/U91RyQtgdZRYK sdqGWqAokL7moLzEH58nf41kJsmlMQv4zuVEcWuoy91jn55dYbckZsS5qzHG4S7ElW4zTI Pll2SK8A1zJ7Jv/EtdvT/T6H/Pg0r2726npWP5nPEoSx8ryixkWrPpLx1Vt5DgxsagLkEn 20WNF5QtawE+iN4N1nFObeqEGibW4ARBGgXdTleFP8WsC0LkLcm3T0ugY8whRLWeaIz59m PCgqwdwPj5TeL4+VUCIkPiSGkqC8mHEK7NqciAwB5tCv+5ESpQNnnZqrmmEpQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681324403; a=rsa-sha256; cv=none; b=krn33SihPJA2lwky8heFNtN4ZtdYx/S0HtVdEdK/wtdiGjmSJDHGoFdhnsnDc8OMc79nPQ 9sJfhTdoeVM4pF6lVvPlRo2soAnEpaIN0itdaNvmaz8YCZuZCWyRcRe4dNTjZGfSggZa/z VFFb9vAx2DY64BdVvpVa3d2YkAhOGs5YS5nHmRf0i7DFODn9wMQPwzdqIwIhM37b099Zub WM+txRHIcia2EGiCi/nLPeO5dZpqjxYBXjBnAeMO0UAf+/xSaecUYypUYVrKfL0S2h208/ 1HNLcmLV9tmnfXJuT03258Qas8zPwWiKLf9FKywtwuGPZY6ael9BuWxzUAph6g== 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 4PxWYb12Qhz19YK; Wed, 12 Apr 2023 18:33:23 +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 33CIXNFV098808; Wed, 12 Apr 2023 18:33:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CIXNWU098807; Wed, 12 Apr 2023 18:33:23 GMT (envelope-from git) Date: Wed, 12 Apr 2023 18:33:23 GMT Message-Id: <202304121833.33CIXNWU098807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 10172ce32c8f - main - Stop stripping 'sf' suffixes from architecture names. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10172ce32c8f2f419ede51b675ed4d30036ef339 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=10172ce32c8f2f419ede51b675ed4d30036ef339 commit 10172ce32c8f2f419ede51b675ed4d30036ef339 Author: John Baldwin AuthorDate: 2023-04-12 18:11:02 +0000 Commit: John Baldwin CommitDate: 2023-04-12 18:11:02 +0000 Stop stripping 'sf' suffixes from architecture names. riscv64sf was the only architecture with an 'sf' suffix. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D39497 --- Makefile.inc1 | 4 ++-- lib/clang/llvm.build.mk | 4 ++-- lib/libclang_rt/compiler-rt-vars.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index e131cc463bc8..60956d58fd9b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -136,9 +136,9 @@ TARGET_TRIPLE_ABI= gnueabi .endif .endif MACHINE_TRIPLE_ABI?= unknown -MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//}-${MACHINE_TRIPLE_ABI}-freebsd${OS_REVISION} +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/}-${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} +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/}-${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 d958a4becc63..609f729430fa 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -49,8 +49,8 @@ TARGET_TRIPLE_ABI= .endif VENDOR= unknown -LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} -LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/:C/sf$//}-${VENDOR}-freebsd${OS_REVISION} +LLVM_TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${VENDOR}-freebsd${OS_REVISION}${TARGET_TRIPLE_ABI} +LLVM_BUILD_TRIPLE?= ${BUILD_ARCH:C/amd64/x86_64/}-${VENDOR}-freebsd${OS_REVISION} CFLAGS+= -DLLVM_DEFAULT_TARGET_TRIPLE=\"${LLVM_TARGET_TRIPLE}\" CFLAGS+= -DLLVM_HOST_TRIPLE=\"${LLVM_BUILD_TRIPLE}\" diff --git a/lib/libclang_rt/compiler-rt-vars.mk b/lib/libclang_rt/compiler-rt-vars.mk index 5658b94b312d..4515d8c98a28 100644 --- a/lib/libclang_rt/compiler-rt-vars.mk +++ b/lib/libclang_rt/compiler-rt-vars.mk @@ -9,7 +9,7 @@ SANITIZER_SHAREDIR= ${CLANGDIR}/share (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") CRTARCH?= armhf .else -CRTARCH?= ${MACHINE_ARCH:S/amd64/x86_64/:C/sf$//} +CRTARCH?= ${MACHINE_ARCH:S/amd64/x86_64/} .endif .if ${COMPILER_TYPE} == "clang"