authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-04-25 21:54:13+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-04-25 21:54:47+02:00
logc855c61432f484a1e4016366d7d178bb90d3e552
tree9e72b96622f20c8816febe9505b7e73b740a5394
parentf3bd49a5d8a8c12e46b930c81435e0306ec7ab46
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

libtsan: backport llvm/llvm-project#194116

https://github.com/llvm/llvm-project/pull/194116

1 files changed, 9 insertions(+), 12 deletions(-)

lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.cpp+9-12
......@@ -152,16 +152,15 @@ typedef struct user_fpregs elf_fpregset_t;
152152#if defined(__mips64)
153153# include <sys/procfs.h>
154154#endif
155#include <sys/user.h>
156#include <linux/if_eql.h>
157#include <linux/if_plip.h>
158#include <linux/lp.h>
159#include <linux/mroute.h>
160#include <linux/mroute6.h>
161#include <linux/scc.h>
162#include <linux/serial.h>
163#include <sys/msg.h>
164#include <sys/ipc.h>
155# include <linux/if_eql.h>
156# include <linux/if_plip.h>
157# include <linux/lp.h>
158# include <linux/mroute.h>
159# include <linux/mroute6.h>
160# include <linux/serial.h>
161# include <sys/ipc.h>
162# include <sys/msg.h>
163# include <sys/user.h>
165164#endif // SANITIZER_ANDROID
166165
167166#include <link.h>
......@@ -534,8 +533,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
534533 unsigned struct_kbsentry_sz = sizeof(struct kbsentry);
535534 unsigned struct_mtconfiginfo_sz = sizeof(struct mtconfiginfo);
536535 unsigned struct_nr_parms_struct_sz = sizeof(struct nr_parms_struct);
537 unsigned struct_scc_modem_sz = sizeof(struct scc_modem);
538 unsigned struct_scc_stat_sz = sizeof(struct scc_stat);
539536 unsigned struct_serial_multiport_struct_sz
540537 = sizeof(struct serial_multiport_struct);
541538 unsigned struct_serial_struct_sz = sizeof(struct serial_struct);