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