Enable --local-caprelocs=elf for Morello

This is done in bsd.{lib,prog}.mk instead of bsd.cpu.mk as it can't be turned off for the lib32 build otherwise.
CTSRD-CHERI · Jan 9, 2025 · c9c2b04 · c9c2b04
1 parent 8a811da
commit c9c2b04
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
@@ -112,6 +112,10 @@ LDFLAGS+= -Wl,-zbti-report=error
 .endif
 .endif
 
+.if ${MACHINE_CPUARCH} == "aarch64" && ${MACHINE_CPU:Mcheri}
+LDFLAGS+= -Wl,--local-caprelocs=elf
+.endif
+
 # Initialize stack variables on function entry
 .if ${OPT_INIT_ALL} != "none"
 .if ${COMPILER_FEATURES:Minit-all}

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
@@ -84,6 +84,10 @@ LDFLAGS+= -Wl,-zbti-report=error
 .endif
 .endif
 
+.if ${MACHINE_CPUARCH} == "aarch64" && ${MACHINE_CPU:Mcheri}
+LDFLAGS+= -Wl,--local-caprelocs=elf
+.endif
+
 # Initialize stack variables on function entry
 .if ${OPT_INIT_ALL} != "none"
 .if ${COMPILER_FEATURES:Minit-all}