diff options
Diffstat (limited to 'devel/llvm-cheri')
| -rw-r--r-- | devel/llvm-cheri/Makefile | 2 | ||||
| -rw-r--r-- | devel/llvm-cheri/Makefile.snapshot | 4 | ||||
| -rw-r--r-- | devel/llvm-cheri/distinfo | 6 | ||||
| -rw-r--r-- | devel/llvm-cheri/files/wrapper-cheri.sh.in | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 66c195ea5d11..afb8aa7ee371 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -75,7 +75,7 @@ GH_TAGNAME= ${LLVM_COMMIT} .include "${.CURDIR}/Makefile.snapshot" OPTIONS_DEFINE= CLANG DOCS EXTRAS LIT LLD STATIC_LIBS XTOOLCHAIN -OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD XTOOLCHAIN +OPTIONS_DEFAULT= CLANG EXTRAS LIT LLD STATIC_LIBS XTOOLCHAIN OPTIONS_SUB= yes CLANG_DESC= Build clang diff --git a/devel/llvm-cheri/Makefile.snapshot b/devel/llvm-cheri/Makefile.snapshot index 0b7c7f1b293a..58029a287703 100644 --- a/devel/llvm-cheri/Makefile.snapshot +++ b/devel/llvm-cheri/Makefile.snapshot @@ -4,6 +4,6 @@ # LLVM_MAJOR= 17 LLVM_RELEASE= ${LLVM_MAJOR}.0.0 -SNAPDATE= 20250225 +SNAPDATE= 20250625 -LLVM_COMMIT= 2207b703e2bbfea3a20598d05c9de42996e120f3 +LLVM_COMMIT= f4d1513a0e4ae782ace5718a0dba19d340f16b91 diff --git a/devel/llvm-cheri/distinfo b/devel/llvm-cheri/distinfo index c046849cd2eb..76265fca5468 100644 --- a/devel/llvm-cheri/distinfo +++ b/devel/llvm-cheri/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1740693924 -SHA256 (CTSRD-CHERI-llvm-project-17.0.d20250225-2207b703e2bbfea3a20598d05c9de42996e120f3_GH0.tar.gz) = df13f9ad3260abfe34705a91793f6076f0240fa418abcb834d8659d50c34e435 -SIZE (CTSRD-CHERI-llvm-project-17.0.d20250225-2207b703e2bbfea3a20598d05c9de42996e120f3_GH0.tar.gz) = 199957278 +TIMESTAMP = 1752097465 +SHA256 (CTSRD-CHERI-llvm-project-17.0.d20250625-f4d1513a0e4ae782ace5718a0dba19d340f16b91_GH0.tar.gz) = b7ab72506c8e2bd55f96a2bf9dee32c004435298842d6f782e46ba6af723b8c3 +SIZE (CTSRD-CHERI-llvm-project-17.0.d20250625-f4d1513a0e4ae782ace5718a0dba19d340f16b91_GH0.tar.gz) = 199971647 diff --git a/devel/llvm-cheri/files/wrapper-cheri.sh.in b/devel/llvm-cheri/files/wrapper-cheri.sh.in index 113aacf20a5a..5e69eafb4638 100644 --- a/devel/llvm-cheri/files/wrapper-cheri.sh.in +++ b/devel/llvm-cheri/files/wrapper-cheri.sh.in @@ -144,6 +144,7 @@ if [ $CHERIBSD_VERSION -gt 0 ]; then tls_flags= vararg_flags= codeptr_flags= + capreloc_flags= if [ "$CHERIBSD_VERSION" -le 20220314 ]; then tls_flags="-femulated-tls" elif [ "$CHERIBSD_VERSION" -le 20220828 ]; then @@ -153,6 +154,9 @@ if [ $CHERIBSD_VERSION -gt 0 ]; then else vararg_flags="-Xclang -morello-vararg=new -Xclang -morello-bounded-memargs" fi + if [ "$CHERIBSD_VERSION" -ge 20250127 ]; then + capreloc_flags="-Wl,--local-caprelocs=elf" + fi if [ "$CHERIBSD_VERSION" -gt 20250127 ]; then codeptr_flags=-cheri-codeptr-relocs fi @@ -160,8 +164,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 $codeptr_flags --end-no-unused-arguments" - arch_ldflags="$codeptr_flags" + 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_objdump_flags="--mattr=+morello" else vararg_flags= |