diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2025-07-23 17:02:44 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2025-07-23 17:04:21 +0000 |
| commit | f8ac5c4406ab5ff98315c8f2c1e13139729a3604 (patch) | |
| tree | 31355aa958569377bd93049c98924c0ed3c0718a /devel | |
| parent | d655a6dbb7042f25e28e2d22b1ddcf79ad60c9ad (diff) | |
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/llvm-cheri/Makefile | 2 | ||||
| -rw-r--r-- | devel/llvm-cheri/files/wrapper-cheri.sh.in | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index afb8aa7ee371..8287e2901a95 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE} -PORTREVISION= 1 +PORTREVISION= 2 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 5e69eafb4638..dd817858326f 100644 --- a/devel/llvm-cheri/files/wrapper-cheri.sh.in +++ b/devel/llvm-cheri/files/wrapper-cheri.sh.in @@ -144,7 +144,8 @@ if [ $CHERIBSD_VERSION -gt 0 ]; then tls_flags= vararg_flags= codeptr_flags= - capreloc_flags= + capreloc_cflags= + capreloc_ldflags= if [ "$CHERIBSD_VERSION" -le 20220314 ]; then tls_flags="-femulated-tls" elif [ "$CHERIBSD_VERSION" -le 20220828 ]; then @@ -155,7 +156,8 @@ if [ $CHERIBSD_VERSION -gt 0 ]; then vararg_flags="-Xclang -morello-vararg=new -Xclang -morello-bounded-memargs" fi if [ "$CHERIBSD_VERSION" -ge 20250127 ]; then - capreloc_flags="-Wl,--local-caprelocs=elf" + capreloc_cflags="-Wl,--local-caprelocs=elf" + capreloc_ldflags="--local-caprelocs=elf" fi if [ "$CHERIBSD_VERSION" -gt 20250127 ]; then codeptr_flags=-cheri-codeptr-relocs @@ -164,8 +166,8 @@ if [ $CHERIBSD_VERSION -gt 0 ]; then # consume -Xclang arguments which can lead to unused # argument warnings so we supress them with # --start/end-no-unused-arguments. - arch_cflags="-march=morello -mabi=purecap --start-no-unused-arguments $tls_flags $vararg_flags $capreloc_flags $codeptr_flags --end-no-unused-arguments" - arch_ldflags="$capreloc_flags $codeptr_flags" + arch_cflags="-march=morello -mabi=purecap --start-no-unused-arguments $tls_flags $vararg_flags $capreloc_cflags $codeptr_flags --end-no-unused-arguments" + arch_ldflags="$capreloc_ldflags $codeptr_flags" arch_objdump_flags="--mattr=+morello" else vararg_flags= |