From nobody Thu Apr 17 20:05:09 2025 X-Original-To: dev-commits-ports-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 4Zdpln3CZ4z5shXd; Thu, 17 Apr 2025 20:05:09 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zdpln1fqFz3rw3; Thu, 17 Apr 2025 20:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744920309; 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=Q9E6i8gXCcEnwo2+Icea6ukVSvayxZlTN/QISLiE2d0=; b=Stt3tiBmm8EYPbeXQRZft0fTWB/hYCzEFMRfbygysAFEgYHmshg3hwn8rQMjihc9OXn52z N9aZBqOIN9eMAB8jKHxhbk2+xA++1sYb0/GGG31GXSsvSktYNu05yXRfzsqpdMtMrxtSQR fQtLQ2rcTPsXSWUAH0oxvj0yajHlAEGPgOM6N8Ay1yfIW4iz3fYYR5ntTxt7rYrg9B3EIm z43tJwU9awHvjajNnHvPmF2L3HAiri8/83/Kre9DtihLNcsFtwOQEpcV2WdwV2CDOCkVZI 2p+Uat8ImXY9c3l1GZIu1eDZhzusM9ayP1zVKy5C5r/tKnXVCb8nNqevCEOXeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744920309; a=rsa-sha256; cv=none; b=kYEj6rW59HOHaDfC6POV2Q3ECVGTIIPQvRGgIJLIJuGcKYhkY2VYwEJnd32Q8yJlzRx0xh Reb/7QA2UijBxKe/bsDlZ0AAD7rXcN7he/100TpVqh7f9pVwfpC7oNKATjPoiYys/CvTv0 a0GqtA16UGIDEv2JL7XtubO3vUps2YoDnKExYj+C7Xi/23FAddyNoEgl20BQizmbtReJ+r plYNko8CNGk0j8cWmNi4AM/xN9LZ3ouO84I44xaaM81ahNcglUSbD22LOFVXRnjbsN5+JP 2GRTkVes/Wo0DabtwcqEiroGm4XDYzCjbPlyAudfQiAHKKnv+EZz1qXKk3eBcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744920309; 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=Q9E6i8gXCcEnwo2+Icea6ukVSvayxZlTN/QISLiE2d0=; b=DY7n3uFQWWi18vAeUQXSxqGGzKkD9g2bFzyOv9kKTU3LbxWwAb0gwuky/Uz0F9d1Vxu/cW qHw6adcxsHIRxjtN9T7kn2XxyWhpBhAAFGH9i8ZDLQnwcZK1Itnans01Gr199QNFZdaeGe 9bHVKLTxdEqtMb36330naao4w12yLB+IvRTqrfn8jse9KGVXRAmYiXlNokKHGkOqPCDH2S yjY6E+FTkpode4CeGX99Bi9t5i5ex76WIx2xl3XA5/GpZLX9u956dp0i2ZZ3Xv2yk+rca6 hBgC/VKqOP27cnYodyuQUEs2VdimMQhx4ZoEXp1Uzogl0ftf8vQb79xahlp4Pw== 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 4Zdpln1Bk5z12bC; Thu, 17 Apr 2025 20:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53HK59Q6096867; Thu, 17 Apr 2025 20:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53HK592b096864; Thu, 17 Apr 2025 20:05:09 GMT (envelope-from git) Date: Thu, 17 Apr 2025 20:05:09 GMT Message-Id: <202504172005.53HK592b096864@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: cbb0094aa11d - main - devel/llvm-{cheri,morello}: allow non-triple targets List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbb0094aa11dda2e06aa264acfb6c19481ae100f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbb0094aa11dda2e06aa264acfb6c19481ae100f commit cbb0094aa11dda2e06aa264acfb6c19481ae100f Author: Brooks Davis AuthorDate: 2025-04-16 19:28:44 +0000 Commit: Brooks Davis CommitDate: 2025-04-17 20:04:32 +0000 devel/llvm-{cheri,morello}: allow non-triple targets aarch64 and aarch64-freebsd are both valid targets so remove all attempts to validate the target in the wrapper script and slightly expand the match for possible CHERI targets. Reported by: jhb Suggestions from: jrtc27 Sponsored by: DARPA, AFRL --- devel/llvm-cheri/Makefile | 2 +- devel/llvm-cheri/files/wrapper-cheri.sh.in | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 733933c863e4..66c195ea5d11 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang PKGNAMESUFFIX= ${LLVM_SUFFIX} diff --git a/devel/llvm-cheri/files/wrapper-cheri.sh.in b/devel/llvm-cheri/files/wrapper-cheri.sh.in index a99decb9b056..113aacf20a5a 100644 --- a/devel/llvm-cheri/files/wrapper-cheri.sh.in +++ b/devel/llvm-cheri/files/wrapper-cheri.sh.in @@ -82,15 +82,7 @@ set_sysroot() set_target() { - local target="$1" - case "$target" in - *-*-*) - _TARGET="$target" - ;; - *) - echo "malformed target triple: '$target'" - ;; - esac + _TARGET="$1" } tool=$0 @@ -147,7 +139,7 @@ arch_objdump_flags= # than a misguided -mcpu flag. if [ $CHERIBSD_VERSION -gt 0 ]; then case "$_TARGET" in - aarch64-*-freebsd*) + aarch64-*-freebsd*|aarch64-freebsd*) if run_tool llvm-readelf -h ${_SYSROOT}/lib/libc.so.7 | grep "Flags:.*purecap" >/dev/null; then tls_flags= vararg_flags= @@ -180,7 +172,7 @@ if [ $CHERIBSD_VERSION -gt 0 ]; then arch_objdump_flags="--mattr=+morello" fi ;; - riscv64-*-freebsd*) + riscv64-*-freebsd*|riscv64-freebsd*) if run_tool llvm-readelf -h ${_SYSROOT}/lib/libc.so.7 | grep "Flags:.*cheriabi" >/dev/null; then mabi=l64pc128d else