Skip to content

Commit

Permalink
libgcc_s: Only pass -D_LIBUNWIND_SANDBOX_OTYPES on aarch64.
Browse files Browse the repository at this point in the history
  • Loading branch information
dstolfa committed Jun 5, 2024
1 parent 97df9be commit 0376053
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions lib/libgcc_s/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ SRCS+= s_logbl.c
SRCS+= s_scalbnl.c
.endif

# LIBUNWIND_SANDBOX_OTYPES is only supported on aarch64 (Morello).
.if (${MACHINE_ABI:Mpurecap} && ${MACHINE_CPUARCH} == "aarch64")
SYMBOL_MAPS+= ${.CURDIR}/Symbol-c18n.map
CFLAGS+= -D_LIBUNWIND_SANDBOX_OTYPES -D_LIBUNWIND_SANDBOX_HARDENED
.endif

.include <bsd.lib.mk>
2 changes: 1 addition & 1 deletion libexec/rtld-elf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ MK_UBSAN= no

.include <bsd.compat.pre.mk>

.if (${MACHINE_ABI:Mpurecap} && ${MACHINE_CPUARCH} == "aarch64")
.if ${MACHINE_ABI:Mpurecap} && ${MACHINE_CPUARCH} == "aarch64"
RTLD_SANDBOX=
.endif

Expand Down

0 comments on commit 0376053

Please sign in to comment.