git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[sanitizer_common] Fix build on ppc64+musl (#120036) 

Cherry picked from LLVM commit 801b519dfd01e21da0be17aa8f8dc2ceb0eb9e77.

In powerpc64-unknown-linux-musl, signal.h does not include asm/ptrace.h,
which causes "member access into incomplete type 'struct pt_regs'"
errors. Include the header explicitly to fix this.

Also in sanitizer_linux_libcdep.cpp, there is a usage of TlsPreTcbSize
which is not defined in such a platform. Guard the branch with macro.
This commit is contained in:
Jeff Law 2025-06-27 15:11:41 -06:00
parent ddff83b3dd
commit 5111ea055f
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsanitizer/sanitizer_common/sanitizer_linux.cpp
View File

@ -86,6 +86,10 @@
# include <sys/sysmacros.h> # include <sys/sysmacros.h>
# endif # endif
# if SANITIZER_LINUX && defined(__powerpc64__)
# include <asm/ptrace.h>
# endif
# if SANITIZER_FREEBSD # if SANITIZER_FREEBSD
# include <machine/atomic.h> # include <machine/atomic.h>
# include <sys/exec.h> # include <sys/exec.h>

13
libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cpp
View File

@ -619,21 +619,22 @@ static void GetTls(uptr *addr, uptr *size) {
*addr = tp - RoundUpTo(*size, align); *addr = tp - RoundUpTo(*size, align);
*size = tp - *addr + ThreadDescriptorSize(); *size = tp - *addr + ThreadDescriptorSize();
# else # else
if (SANITIZER_GLIBC) # if SANITIZER_GLIBC
*size += 1664; *size += 1664;
else if (SANITIZER_FREEBSD) # elif SANITIZER_FREEBSD
*size += 128; // RTLD_STATIC_TLS_EXTRA *size += 128; // RTLD_STATIC_TLS_EXTRA
# if defined(__mips__) || defined(__powerpc64__) || SANITIZER_RISCV64 # if defined(__mips__) || defined(__powerpc64__) || SANITIZER_RISCV64
const uptr pre_tcb_size = TlsPreTcbSize(); const uptr pre_tcb_size = TlsPreTcbSize();
*addr -= pre_tcb_size; *addr -= pre_tcb_size;
*size += pre_tcb_size; *size += pre_tcb_size;
# else # else
// arm and aarch64 reserve two words at TP, so this underestimates the range. // arm and aarch64 reserve two words at TP, so this underestimates the range.
// However, this is sufficient for the purpose of finding the pointers to // However, this is sufficient for the purpose of finding the pointers to
// thread-specific data keys. // thread-specific data keys.
const uptr tcb_size = ThreadDescriptorSize(); const uptr tcb_size = ThreadDescriptorSize();
*addr -= tcb_size; *addr -= tcb_size;
*size += tcb_size; *size += tcb_size;
# endif
# endif # endif
# endif # endif
# elif SANITIZER_NETBSD # elif SANITIZER_NETBSD

2
libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
View File

@ -96,7 +96,7 @@
# include <sys/ptrace.h> # include <sys/ptrace.h>
# if defined(__mips64) || defined(__aarch64__) || defined(__arm__) || \ # if defined(__mips64) || defined(__aarch64__) || defined(__arm__) || \
defined(__hexagon__) || defined(__loongarch__) || SANITIZER_RISCV64 || \ defined(__hexagon__) || defined(__loongarch__) || SANITIZER_RISCV64 || \
defined(__sparc__) defined(__sparc__) || defined(__powerpc64__)
# include <asm/ptrace.h> # include <asm/ptrace.h>
# ifdef __arm__ # ifdef __arm__
typedef struct user_fpregs elf_fpregset_t; typedef struct user_fpregs elf_fpregset_t;

3
libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp
View File

@ -31,7 +31,8 @@
#include <sys/types.h> // for pid_t #include <sys/types.h> // for pid_t
#include <sys/uio.h> // for iovec #include <sys/uio.h> // for iovec
#include <elf.h> // for NT_PRSTATUS #include <elf.h> // for NT_PRSTATUS
#if (defined(__aarch64__) || SANITIZER_RISCV64 || SANITIZER_LOONGARCH64) && \ #if (defined(__aarch64__) || defined(__powerpc64__) || \
SANITIZER_RISCV64 || SANITIZER_LOONGARCH64) && \
!SANITIZER_ANDROID !SANITIZER_ANDROID
// GLIBC 2.20+ sys/user does not include asm/ptrace.h // GLIBC 2.20+ sys/user does not include asm/ptrace.h
# include <asm/ptrace.h> # include <asm/ptrace.h>