diff --git a/sys-devel/llvm/llvm20-20.1.4.recipe b/sys-devel/llvm/llvm20-20.1.7.recipe similarity index 99% rename from sys-devel/llvm/llvm20-20.1.4.recipe rename to sys-devel/llvm/llvm20-20.1.7.recipe index d8f50c334..112dc5486 100644 --- a/sys-devel/llvm/llvm20-20.1.4.recipe +++ b/sys-devel/llvm/llvm20-20.1.7.recipe @@ -30,9 +30,9 @@ other than the ones listed above. HOMEPAGE="https://www.llvm.org/" COPYRIGHT="2003-2025 University of Illinois at Urbana-Champaign" LICENSE="Apache v2 with LLVM Exception" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/llvm-project-$portVersion.src.tar.xz" -CHECKSUM_SHA256="a95365b02536ed4aef29b325c205dd89c268cba41503ab2fc05f81418613ab63" +CHECKSUM_SHA256="cd8fd55d97ad3e360b1d5aaf98388d1f70dfffb7df36beee478be3b839ff9008" SOURCE_DIR="llvm-project-$portVersion.src" PATCHES="llvm20-$portVersion.patchset" diff --git a/sys-devel/llvm/patches/llvm20-20.1.4.patchset b/sys-devel/llvm/patches/llvm20-20.1.7.patchset similarity index 97% rename from sys-devel/llvm/patches/llvm20-20.1.4.patchset rename to sys-devel/llvm/patches/llvm20-20.1.7.patchset index 040524d16..25b7b65fd 100644 --- a/sys-devel/llvm/patches/llvm20-20.1.4.patchset +++ b/sys-devel/llvm/patches/llvm20-20.1.7.patchset @@ -1,4 +1,4 @@ -From 3711bb1867f615c4fdba116d823d92dd1f7742f1 Mon Sep 17 00:00:00 2001 +From c1f4904175a80ef2ca2ca473773a66580c88b962 Mon Sep 17 00:00:00 2001 From: Calvin Hill Date: Sun, 9 Sep 2018 16:11:42 +0100 Subject: llvm: import header dir suffix patch from 3dEyes @@ -24,7 +24,7 @@ index d5b76b1..df3fb59 100644 2.48.1 -From 519df7ed415f2c62f0c2d1f44ad5d5bacc902574 Mon Sep 17 00:00:00 2001 +From 23da6766ab9dc905e6e957c4410136a54aeb3671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 18 Jul 2016 14:13:19 +0200 Subject: clang: support for secondary arch. @@ -119,7 +119,7 @@ index af74f43..fa3f8cb 100644 2.48.1 -From be4107fd21ce49da1cef3de468b8de8a3dfd7e66 Mon Sep 17 00:00:00 2001 +From fdfcd47c20d318a06d8eacb896ea37b2f5fd3ffc Mon Sep 17 00:00:00 2001 From: David Karoly Date: Thu, 21 Sep 2023 17:44:12 +0000 Subject: fix build on x86 secondary arch @@ -142,7 +142,7 @@ index 4312411..04db3fb 100644 2.48.1 -From 4acc0f2dd1c40e4ce2cfe3dc1bd5e04ebfe209d2 Mon Sep 17 00:00:00 2001 +From 8203563ffdc61a864ccbf4543373d3f961ef45b2 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Mon, 6 Nov 2023 14:24:21 +0100 Subject: clang: Haiku: patch for analyzer scripts @@ -204,7 +204,7 @@ index d01aebb..43ba8c3 100755 2.48.1 -From 68d94075792b72f7efa358a0d4105d9cc06c74c8 Mon Sep 17 00:00:00 2001 +From a3f3bbaf56fff71e88b020ced252db1955ea2306 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Mon, 10 Jun 2024 11:13:29 +0200 Subject: A slightly better llvm-config diff that doesn't use #ifdef. @@ -250,7 +250,7 @@ index df3fb59..30cb748 100644 2.48.1 -From eceeabebcd7a68b1eec6853dbee44b1829ad23f5 Mon Sep 17 00:00:00 2001 +From 18b56a26800f81c4b97431cdfd531c08fa45c4ea Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 19 May 2024 10:31:55 +0200 Subject: Allow linking gcc compiled code with lld @@ -276,7 +276,7 @@ index a1e9eca..cc563d7 100644 2.48.1 -From a11e6dfba0366ce78a2e235382c6619385a1bfbf Mon Sep 17 00:00:00 2001 +From f67dc17c569687d8d7089ad13b168ec0e02a7296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 6 Feb 2025 21:08:43 +0100 Subject: Haiku: Address sanitizer on x86_64 @@ -594,7 +594,7 @@ index 09391e4..d23cdeb 100644 # Too many existing bugs, needs cleanup. diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc -index 49ec409..f88f914 100644 +index dda11da..bc8f028 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc @@ -48,35 +48,39 @@ static void ioctl_table_fill() { @@ -684,7 +684,7 @@ index 9e6e71e..c2ea52b 100644 // Those might not present or their value differ on different platforms. extern const int errno_EOWNERDEAD; diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp -index 7aa48d2..ca74ce8 100644 +index a4d526b..4293c0a 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp @@ -14,7 +14,7 @@ @@ -716,7 +716,7 @@ index 7aa48d2..ca74ce8 100644 # include # if SANITIZER_LINUX -@@ -114,6 +116,13 @@ extern struct ps_strings *__ps_strings; +@@ -118,6 +120,13 @@ extern struct ps_strings *__ps_strings; # define environ _environ # endif @@ -730,7 +730,7 @@ index 7aa48d2..ca74ce8 100644 extern char **environ; # if SANITIZER_LINUX -@@ -242,7 +251,7 @@ ScopedBlockSignals::~ScopedBlockSignals() { SetSigProcMask(&saved_, nullptr); } +@@ -246,7 +255,7 @@ ScopedBlockSignals::~ScopedBlockSignals() { SetSigProcMask(&saved_, nullptr); } # endif // --------------- sanitizer_libc.h @@ -739,7 +739,7 @@ index 7aa48d2..ca74ce8 100644 # if !SANITIZER_S390 uptr internal_mmap(void *addr, uptr length, int prot, int flags, int fd, u64 offset) { -@@ -589,7 +598,7 @@ uptr internal_execve(const char *filename, char *const argv[], +@@ -593,7 +602,7 @@ uptr internal_execve(const char *filename, char *const argv[], } # endif // !SANITIZER_SOLARIS && !SANITIZER_NETBSD @@ -748,7 +748,7 @@ index 7aa48d2..ca74ce8 100644 void internal__exit(int exitcode) { # if SANITIZER_FREEBSD || SANITIZER_SOLARIS internal_syscall(SYSCALL(exit), exitcode); -@@ -626,7 +635,9 @@ tid_t GetTid() { +@@ -630,7 +639,9 @@ tid_t GetTid() { return Tid; # elif SANITIZER_SOLARIS return thr_self(); @@ -759,7 +759,7 @@ index 7aa48d2..ca74ce8 100644 return internal_syscall(SYSCALL(gettid)); # endif } -@@ -641,7 +652,9 @@ int TgKill(pid_t pid, tid_t tid, int sig) { +@@ -645,7 +656,9 @@ int TgKill(pid_t pid, tid_t tid, int sig) { errno = thr_kill(tid, sig); // TgKill is expected to return -1 on error, not an errno. return errno != 0 ? -1 : 0; @@ -770,7 +770,7 @@ index 7aa48d2..ca74ce8 100644 } # endif -@@ -668,7 +681,7 @@ u64 NanoTime() { +@@ -672,7 +685,7 @@ u64 NanoTime() { // 'environ' array (on some others) and does not use libc. This function // should be called first inside __asan_init. const char *GetEnv(const char *name) { @@ -779,7 +779,7 @@ index 7aa48d2..ca74ce8 100644 if (::environ != 0) { uptr NameLen = internal_strlen(name); for (char **Env = ::environ; *Env != 0; Env++) { -@@ -739,7 +752,10 @@ static void ReadNullSepFileToArray(const char *path, char ***arr, +@@ -743,7 +756,10 @@ static void ReadNullSepFileToArray(const char *path, char ***arr, # endif static void GetArgsAndEnv(char ***argv, char ***envp) { @@ -791,7 +791,7 @@ index 7aa48d2..ca74ce8 100644 // On FreeBSD, retrieving the argument and environment arrays is done via the // kern.ps_strings sysctl, which returns a pointer to a structure containing // this information. See also . -@@ -798,7 +814,7 @@ char **GetEnviron() { +@@ -802,7 +818,7 @@ char **GetEnviron() { void FutexWait(atomic_uint32_t *p, u32 cmp) { # if SANITIZER_FREEBSD _umtx_op(p, UMTX_OP_WAIT_UINT, cmp, 0, 0); @@ -800,7 +800,7 @@ index 7aa48d2..ca74ce8 100644 sched_yield(); /* No userspace futex-like synchronization */ # else internal_syscall(SYSCALL(futex), (uptr)p, FUTEX_WAIT_PRIVATE, cmp, 0, 0, 0); -@@ -808,7 +824,7 @@ void FutexWait(atomic_uint32_t *p, u32 cmp) { +@@ -812,7 +828,7 @@ void FutexWait(atomic_uint32_t *p, u32 cmp) { void FutexWake(atomic_uint32_t *p, u32 count) { # if SANITIZER_FREEBSD _umtx_op(p, UMTX_OP_WAKE, count, 0, 0); @@ -809,7 +809,7 @@ index 7aa48d2..ca74ce8 100644 /* No userspace futex-like synchronization */ # else internal_syscall(SYSCALL(futex), (uptr)p, FUTEX_WAKE_PRIVATE, count, 0, 0, 0); -@@ -840,7 +856,7 @@ struct linux_dirent { +@@ -844,7 +860,7 @@ struct linux_dirent { }; # endif @@ -818,7 +818,7 @@ index 7aa48d2..ca74ce8 100644 // Syscall wrappers. uptr internal_ptrace(int request, int pid, void *addr, void *data) { return internal_syscall(SYSCALL(ptrace), request, pid, (uptr)addr, -@@ -1054,7 +1070,7 @@ bool internal_sigismember(__sanitizer_sigset_t *set, int signum) { +@@ -1058,7 +1074,7 @@ bool internal_sigismember(__sanitizer_sigset_t *set, int signum) { # endif # endif // !SANITIZER_SOLARIS @@ -827,7 +827,7 @@ index 7aa48d2..ca74ce8 100644 // ThreadLister implementation. ThreadLister::ThreadLister(pid_t pid) : buffer_(4096) { task_path_.AppendF("/proc/%d/task", pid); -@@ -1248,7 +1264,19 @@ uptr GetPageSize() { +@@ -1252,7 +1268,19 @@ uptr GetPageSize() { # endif uptr ReadBinaryName(/*out*/ char *buf, uptr buf_len) { @@ -848,7 +848,7 @@ index 7aa48d2..ca74ce8 100644 const char *default_module_name = getexecname(); CHECK_NE(default_module_name, NULL); return internal_snprintf(buf, buf_len, "%s", default_module_name); -@@ -1314,11 +1342,11 @@ bool LibraryNameIs(const char *full_name, const char *base_name) { +@@ -1318,11 +1346,11 @@ bool LibraryNameIs(const char *full_name, const char *base_name) { return (name[base_name_length] == '-' || name[base_name_length] == '.'); } @@ -862,7 +862,7 @@ index 7aa48d2..ca74ce8 100644 typedef ElfW(Phdr) Elf_Phdr; typedef ElfW(Ehdr) Elf_Ehdr; # endif // !SANITIZER_FREEBSD -@@ -1977,12 +2005,16 @@ using Context = ucontext_t; +@@ -1981,12 +2009,16 @@ using Context = ucontext_t; SignalContext::WriteFlag SignalContext::GetWriteFlag() const { Context *ucontext = (Context *)context; # if defined(__x86_64__) || defined(__i386__) @@ -880,7 +880,7 @@ index 7aa48d2..ca74ce8 100644 const int Err = 13; uptr err = ucontext->uc_mcontext.gregs[Err]; # else -@@ -2594,6 +2626,11 @@ static void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) { +@@ -2598,6 +2630,11 @@ static void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) { *pc = ucontext->uc_mcontext.mc_rip; *bp = ucontext->uc_mcontext.mc_rbp; *sp = ucontext->uc_mcontext.mc_rsp; @@ -926,7 +926,7 @@ index 8b7874b..489c948 100644 // Syscall wrappers. uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp -index e11eff1..950f644 100644 +index 331e1c7..2aaf19f 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp @@ -13,8 +13,10 @@ @@ -953,7 +953,7 @@ index e11eff1..950f644 100644 # if SANITIZER_ANDROID # include # if !defined(CPU_COUNT) && !defined(__aarch64__) -@@ -650,7 +657,6 @@ static void GetTls(uptr *addr, uptr *size) { +@@ -651,7 +658,6 @@ static void GetTls(uptr *addr, uptr *size) { *addr = (uptr)tcb->tcb_dtv[1]; } } @@ -961,7 +961,7 @@ index e11eff1..950f644 100644 # error "Unknown OS" # endif } -@@ -720,8 +726,13 @@ static int AddModuleSegments(const char *module_name, dl_phdr_info *info, +@@ -721,8 +727,13 @@ static int AddModuleSegments(const char *module_name, dl_phdr_info *info, if (phdr->p_type == PT_LOAD) { uptr cur_beg = info->dlpi_addr + phdr->p_vaddr; uptr cur_end = cur_beg + phdr->p_memsz; @@ -975,7 +975,7 @@ index e11eff1..950f644 100644 cur_module.addAddressRange(cur_beg, cur_end, executable, writable); } else if (phdr->p_type == PT_NOTE) { # ifdef NT_GNU_BUILD_ID -@@ -857,6 +868,10 @@ u32 GetNumberOfCPUs() { +@@ -858,6 +869,10 @@ u32 GetNumberOfCPUs() { req[1] = HW_NCPU; CHECK_EQ(internal_sysctl(req, 2, &ncpu, &len, NULL, 0), 0); return ncpu; @@ -1378,7 +1378,7 @@ index 5796640..1b9f59b 100644 #else # define SANITIZER_MADVISE_DONTNEED MADV_DONTNEED diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp -index a5311d2..c8798a2 100644 +index b3e7175..6703f81 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp @@ -24,7 +24,7 @@ @@ -1470,7 +1470,7 @@ index a5311d2..c8798a2 100644 const int wordexp_wrde_dooffs = WRDE_DOOFFS; # endif // !SANITIZER_ANDROID -@@ -540,7 +551,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); +@@ -537,7 +548,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog); # endif // SANITIZER_GLIBC @@ -1479,7 +1479,7 @@ index a5311d2..c8798a2 100644 unsigned struct_sioc_sg_req_sz = sizeof(struct sioc_sg_req); unsigned struct_sioc_vif_req_sz = sizeof(struct sioc_vif_req); #endif -@@ -551,12 +562,14 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); +@@ -548,12 +559,14 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); const unsigned IOCTL_NOT_PRESENT = 0; @@ -1495,7 +1495,7 @@ index a5311d2..c8798a2 100644 unsigned IOCTL_SIOCADDMULTI = SIOCADDMULTI; unsigned IOCTL_SIOCATMARK = SIOCATMARK; unsigned IOCTL_SIOCDELMULTI = SIOCDELMULTI; -@@ -577,23 +590,27 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); +@@ -574,23 +587,27 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); unsigned IOCTL_SIOCSIFMTU = SIOCSIFMTU; unsigned IOCTL_SIOCSIFNETMASK = SIOCSIFNETMASK; unsigned IOCTL_SIOCSPGRP = SIOCSPGRP; @@ -1528,7 +1528,7 @@ index a5311d2..c8798a2 100644 unsigned IOCTL_TIOCSWINSZ = TIOCSWINSZ; #if SANITIZER_LINUX && !SANITIZER_ANDROID unsigned IOCTL_SIOCGETSGCNT = SIOCGETSGCNT; -@@ -1103,7 +1120,7 @@ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); +@@ -1100,7 +1117,7 @@ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); CHECK_SIZE_AND_OFFSET(dirent, d_ino); #if SANITIZER_APPLE CHECK_SIZE_AND_OFFSET(dirent, d_seekoff); @@ -1537,7 +1537,7 @@ index a5311d2..c8798a2 100644 // There is no 'd_off' field on FreeBSD. #else CHECK_SIZE_AND_OFFSET(dirent, d_off); -@@ -1119,7 +1136,9 @@ CHECK_SIZE_AND_OFFSET(dirent64, d_reclen); +@@ -1116,7 +1133,9 @@ CHECK_SIZE_AND_OFFSET(dirent64, d_reclen); CHECK_TYPE_SIZE(ifconf); CHECK_SIZE_AND_OFFSET(ifconf, ifc_len); @@ -1547,7 +1547,7 @@ index a5311d2..c8798a2 100644 CHECK_TYPE_SIZE(pollfd); CHECK_SIZE_AND_OFFSET(pollfd, fd); -@@ -1174,7 +1193,7 @@ CHECK_TYPE_SIZE(__kernel_loff_t); +@@ -1171,7 +1190,7 @@ CHECK_TYPE_SIZE(__kernel_loff_t); CHECK_TYPE_SIZE(__kernel_fd_set); #endif @@ -1556,7 +1556,7 @@ index a5311d2..c8798a2 100644 CHECK_TYPE_SIZE(wordexp_t); CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordc); CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordv); -@@ -1204,7 +1223,9 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_freq); +@@ -1201,7 +1220,9 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_freq); CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); #endif @@ -1566,7 +1566,7 @@ index a5311d2..c8798a2 100644 #if SANITIZER_GLIBC || SANITIZER_FREEBSD CHECK_TYPE_SIZE(ipc_perm); -@@ -1242,7 +1263,7 @@ CHECK_TYPE_SIZE(clock_t); +@@ -1239,7 +1260,7 @@ CHECK_TYPE_SIZE(clock_t); CHECK_TYPE_SIZE(clockid_t); #endif @@ -1576,7 +1576,7 @@ index a5311d2..c8798a2 100644 CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_next); CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_name); diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h -index 1a7d9e6..e53923e 100644 +index 005ff27..0aeaa54 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h @@ -14,7 +14,7 @@ @@ -1689,7 +1689,7 @@ index 1a7d9e6..e53923e 100644 unsigned ai_addrlen; char *ai_canonname; void *ai_addr; -@@ -1128,23 +1148,25 @@ extern unsigned IOCTL_SIOCSIFMETRIC; +@@ -1127,23 +1147,25 @@ extern unsigned IOCTL_SIOCSIFMETRIC; extern unsigned IOCTL_SIOCSIFMTU; extern unsigned IOCTL_SIOCSIFNETMASK; extern unsigned IOCTL_SIOCSPGRP; @@ -1936,7 +1936,7 @@ index bbe7040..9289b99 100644 2.48.1 -From f451df45507f647b627df6685669ae44bd930c1f Mon Sep 17 00:00:00 2001 +From d68eb441aff83477a840e911d2f18cdcceaaf411 Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Sun, 15 Dec 2024 10:26:32 +0000 Subject: Add support for Haiku @@ -2201,7 +2201,7 @@ index a73f2b3..4c17802 100644 2.48.1 -From 6d12de5c34ce1188ff948b856049ea35a5fb288c Mon Sep 17 00:00:00 2001 +From 80d8a9583dec1e39c87ee407bf615e88bd275bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 24 Mar 2025 21:41:12 +0100 Subject: install headers in clang/../include/ where clang searches them @@ -2224,7 +2224,7 @@ index d92bc0e..4268fbb 100644 2.48.1 -From b965fd4943d5bcde23b47e7cb5ab31f082100557 Mon Sep 17 00:00:00 2001 +From 6acc2f0a14f2887479934116eaf56d5d116944af Mon Sep 17 00:00:00 2001 From: Luc Schrijvers Date: Thu, 17 Apr 2025 16:38:48 +0200 Subject: Fix missing PATH for stddef @@ -2253,7 +2253,7 @@ index 79054fe..c1c7341 100644 2.48.1 -From 0e15dba3cc088fbc604ecd65e6d74688c8bb90cf Mon Sep 17 00:00:00 2001 +From ddd6a569c3a9e626e298d4236bc0e88e1e490135 Mon Sep 17 00:00:00 2001 From: Trung Nguyen Date: Fri, 11 Apr 2025 23:53:14 +1000 Subject: Fix signal frame unwinding @@ -2503,7 +2503,7 @@ index 3831d8e..4e659cd 100644 2.48.1 -From e667485cfc0b32934788a6a7041bcd464bf77815 Mon Sep 17 00:00:00 2001 +From bfda5cf297cf4eb747e7aed5da88073cd1afa1a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sat, 24 May 2025 22:24:52 +0200 Subject: fix x86 build @@ -2511,10 +2511,10 @@ Subject: fix x86 build r13 doesn't provide the trap err. diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp -index ca74ce8..350a59c 100644 +index 4293c0a..55c1f4e 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp -@@ -1265,7 +1265,7 @@ uptr GetPageSize() { +@@ -1269,7 +1269,7 @@ uptr GetPageSize() { uptr ReadBinaryName(/*out*/ char *buf, uptr buf_len) { # if SANITIZER_HAIKU @@ -2523,7 +2523,7 @@ index ca74ce8..350a59c 100644 image_info info; const char *argv0 = ""; while (get_next_image_info(B_CURRENT_TEAM, &cookie, &info) == B_OK) { -@@ -2013,7 +2013,7 @@ SignalContext::WriteFlag SignalContext::GetWriteFlag() const { +@@ -2017,7 +2017,7 @@ SignalContext::WriteFlag SignalContext::GetWriteFlag() const { # elif SANITIZER_NETBSD uptr err = ucontext->uc_mcontext.__gregs[_REG_ERR]; # elif SANITIZER_HAIKU @@ -2532,7 +2532,7 @@ index ca74ce8..350a59c 100644 # elif SANITIZER_SOLARIS && defined(__i386__) const int Err = 13; uptr err = ucontext->uc_mcontext.gregs[Err]; -@@ -2643,6 +2643,11 @@ static void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) { +@@ -2647,6 +2647,11 @@ static void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) { *pc = ucontext->uc_mcontext.mc_eip; *bp = ucontext->uc_mcontext.mc_ebp; *sp = ucontext->uc_mcontext.mc_esp; @@ -2545,7 +2545,7 @@ index ca74ce8..350a59c 100644 ucontext_t *ucontext = (ucontext_t *)context; # if SANITIZER_SOLARIS diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h -index e53923e..e39c545 100644 +index 0aeaa54..5172ae6 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h @@ -603,7 +603,11 @@ typedef unsigned long __sanitizer_sigset_t;