mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #23856 from alexrp/backport-llvm-120036

Browse source
This commit is contained in:
Alex Rønne Petersen 2025-05-13 01:08:07 +02:00 • committed by GitHub
commit a3693aae3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/libtsan/sanitizer_common/sanitizer_linux.cpp vendored
View file

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

5
lib/libtsan/sanitizer_common/sanitizer_linux_libcdep.cpp vendored
View file

@ -619,9 +619,9 @@ static void GetTls(uptr *addr, uptr *size) {
*addr = tp - RoundUpTo(*size, align);
*size = tp - *addr + ThreadDescriptorSize();
# else
if (SANITIZER_GLIBC)
# if SANITIZER_GLIBC
*size += 1664;
else if (SANITIZER_FREEBSD)
# elif SANITIZER_FREEBSD
*size += 128; // RTLD_STATIC_TLS_EXTRA
# if defined(__mips__) || defined(__powerpc64__) || SANITIZER_RISCV64
const uptr pre_tcb_size = TlsPreTcbSize();
@ -636,6 +636,7 @@ static void GetTls(uptr *addr, uptr *size) {
*size += tcb_size;
# endif
# endif
# endif
# elif SANITIZER_NETBSD
struct tls_tcb *const tcb = ThreadSelfTlsTcb();
*addr = 0;

2
lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.cpp vendored
View file

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

3
lib/libtsan/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp vendored
View file

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

1
src/libs/libtsan.zig
View file

@ -346,6 +346,7 @@ fn addCcArgs(target: std.Target, args: *std.ArrayList([]const u8)) error{OutOfMe
"-std=c++17",
"-fno-rtti",
"-fno-exceptions",
"-w", // Disable all warnings.
});
if (target.abi.isAndroid() and target.os.version_range.linux.android >= 29) {