Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Guard -D_LIBUNWIND_SANDBOX_OTYPES behind an aarch64 check #2107

Merged
merged 2 commits into from
Jun 7, 2024
Merged

Guard -D_LIBUNWIND_SANDBOX_OTYPES behind an aarch64 check #2107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19c8df9
libgcc_s: Only pass -D_LIBUNWIND_SANDBOX_OTYPES on aarch64.
dstolfa Jun 5, 2024
ea5851b
rtld-elf: Remove unnecessary parentheses in the Makefile.
dstolfa Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/libgcc_s/Makefile
View file
Open in desktop
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
View file
Open in desktop
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
Loading