wok-current view gcc/stuff/glibc-2.31-libsanitizer-2.patch @ rev 25785
Mass rebuild after bump to glibc 2.31, add epson printer and scanner package
author | Stanislas Leduc <shann@slitaz.org> |
---|---|
date | Tue Jul 15 20:40:17 2025 +0000 (3 months ago) |
parents | |
children |
line source
1 From 75003cdd23c310ec385344e8040d490e8dd6d2be Mon Sep 17 00:00:00 2001
2 From: Jakub Jelinek <jakub@redhat.com>
3 Date: Fri, 20 Dec 2019 17:58:35 +0100
4 Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
5 bootstrap due to libsanitizer)
7 Backported from mainline
8 2019-11-26 Jakub Jelinek <jakub@redhat.com>
10 PR sanitizer/92154
11 * sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick
12 llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.
13 * sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise.
15 From-SVN: r279653
16 ---
17 libsanitizer/ChangeLog | 10 ++++++++++
18 .../sanitizer_platform_limits_posix.cc | 9 +++------
19 .../sanitizer_platform_limits_posix.h | 15 +--------------
20 3 files changed, 14 insertions(+), 20 deletions(-)
22 diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
23 index 06a605ff4670..d823a12190c0 100644
24 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
25 +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
26 @@ -1156,12 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
27 CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
28 CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
29 CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
30 -#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
31 - !defined(__arm__)
32 -/* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */
33 -/* On Arm glibc 2.31 and later provide a different mode field, this field is
34 - never used by libsanitizer so we can simply ignore this assert for all glibc
35 - versions. */
36 +#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
37 +/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
38 + on many architectures. */
39 CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
40 #endif
42 diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
43 index 73af92af1e8f..6a673a7c9959 100644
44 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
45 +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
46 @@ -211,26 +211,13 @@ namespace __sanitizer {
47 u64 __unused1;
48 u64 __unused2;
49 #elif defined(__sparc__)
50 -#if defined(__arch64__)
51 unsigned mode;
52 - unsigned short __pad1;
53 -#else
54 - unsigned short __pad1;
55 - unsigned short mode;
56 unsigned short __pad2;
57 -#endif
58 unsigned short __seq;
59 unsigned long long __unused1;
60 unsigned long long __unused2;
61 -#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
62 - unsigned int mode;
63 - unsigned short __seq;
64 - unsigned short __pad1;
65 - unsigned long __unused1;
66 - unsigned long __unused2;
67 #else
68 - unsigned short mode;
69 - unsigned short __pad1;
70 + unsigned int mode;
71 unsigned short __seq;
72 unsigned short __pad2;
73 #if defined(__x86_64__) && !defined(_LP64)