wok-current diff 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 diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/gcc/stuff/glibc-2.31-libsanitizer-2.patch	Tue Jul 15 20:40:17 2025 +0000
     1.3 @@ -0,0 +1,73 @@
     1.4 +From 75003cdd23c310ec385344e8040d490e8dd6d2be Mon Sep 17 00:00:00 2001
     1.5 +From: Jakub Jelinek <jakub@redhat.com>
     1.6 +Date: Fri, 20 Dec 2019 17:58:35 +0100
     1.7 +Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
     1.8 + bootstrap due to libsanitizer)
     1.9 +
    1.10 +	Backported from mainline
    1.11 +	2019-11-26  Jakub Jelinek  <jakub@redhat.com>
    1.12 +
    1.13 +	PR sanitizer/92154
    1.14 +	* sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick
    1.15 +	llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.
    1.16 +	* sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise.
    1.17 +
    1.18 +From-SVN: r279653
    1.19 +---
    1.20 + libsanitizer/ChangeLog                            | 10 ++++++++++
    1.21 + .../sanitizer_platform_limits_posix.cc            |  9 +++------
    1.22 + .../sanitizer_platform_limits_posix.h             | 15 +--------------
    1.23 + 3 files changed, 14 insertions(+), 20 deletions(-)
    1.24 +
    1.25 +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
    1.26 +index 06a605ff4670..d823a12190c0 100644
    1.27 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
    1.28 ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
    1.29 +@@ -1156,12 +1156,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
    1.30 + CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
    1.31 + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
    1.32 + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
    1.33 +-#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
    1.34 +-    !defined(__arm__)
    1.35 +-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
    1.36 +-/* On Arm glibc 2.31 and later provide a different mode field, this field is
    1.37 +-   never used by libsanitizer so we can simply ignore this assert for all glibc
    1.38 +-   versions.  */
    1.39 ++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
    1.40 ++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
    1.41 ++   on many architectures.  */
    1.42 + CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
    1.43 + #endif
    1.44 + 
    1.45 +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
    1.46 +index 73af92af1e8f..6a673a7c9959 100644
    1.47 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
    1.48 ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
    1.49 +@@ -211,26 +211,13 @@ namespace __sanitizer {
    1.50 +     u64 __unused1;
    1.51 +     u64 __unused2;
    1.52 + #elif defined(__sparc__)
    1.53 +-#if defined(__arch64__)
    1.54 +     unsigned mode;
    1.55 +-    unsigned short __pad1;
    1.56 +-#else
    1.57 +-    unsigned short __pad1;
    1.58 +-    unsigned short mode;
    1.59 +     unsigned short __pad2;
    1.60 +-#endif
    1.61 +     unsigned short __seq;
    1.62 +     unsigned long long __unused1;
    1.63 +     unsigned long long __unused2;
    1.64 +-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
    1.65 +-    unsigned int mode;
    1.66 +-    unsigned short __seq;
    1.67 +-    unsigned short __pad1;
    1.68 +-    unsigned long __unused1;
    1.69 +-    unsigned long __unused2;
    1.70 + #else
    1.71 +-    unsigned short mode;
    1.72 +-    unsigned short __pad1;
    1.73 ++    unsigned int mode;
    1.74 +     unsigned short __seq;
    1.75 +     unsigned short __pad2;
    1.76 + #if defined(__x86_64__) && !defined(_LP64)