git: 1cf80317e3ec - main - devel/llvm-{cheri,morello}: future-proof ABI arguments

From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Thu, 30 Jan 2025 17:50:07 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1cf80317e3ec97f4813ad04efb89402f14af85fb

commit 1cf80317e3ec97f4813ad04efb89402f14af85fb
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2025-01-30 17:46:27 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2025-01-30 17:49:52 +0000

    devel/llvm-{cheri,morello}: future-proof ABI arguments
    
    -Xclang arguments may become unused with never compiler versions so
    bracket them with --start-no-unused-arguments/--end-no-unused-arguments
    to silence warnings.
    
    Reported by:    jrtc27
    Sponsored by:   DARPA, AFRL
---
 devel/llvm-cheri/Makefile                  | 2 +-
 devel/llvm-cheri/files/wrapper-cheri.sh.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile
index d34af337a860..c6855d280205 100644
--- a/devel/llvm-cheri/Makefile
+++ b/devel/llvm-cheri/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
-PORTREVISION=	2
+PORTREVISION=	3
 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 2e6b66b81be4..023833f23195 100644
--- a/devel/llvm-cheri/files/wrapper-cheri.sh.in
+++ b/devel/llvm-cheri/files/wrapper-cheri.sh.in
@@ -160,7 +160,7 @@ if [ $CHERIBSD_VERSION -gt 0 ]; then
 				vararg_flags="-Xclang -morello-vararg=new -Xclang -morello-bounded-memargs"
 			fi
 
-			arch_cflags="-march=morello -mabi=purecap $tls_flags $vararg_flags"
+			arch_cflags="-march=morello -mabi=purecap --start-no-unused-arguments $tls_flags $vararg_flags --end-no-unused-arguments"
 			arch_objdump_flags="--mattr=+morello"
 		else
 			vararg_flags=