aboutsummaryrefslogtreecommitdiff
Adjust libsanitizer to ABI change in glibc 2.31.

Adapted to 3.x from this upstream commit:
https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce

diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -1139,8 +1139,9 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
 CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
+/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
+   on many architectures.  */
 CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
 #endif
 
diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -194,17 +194,16 @@ namespace __sanitizer {
     unsigned __seq;
     u64 __unused1;
     u64 __unused2;
-#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
-    unsigned int mode;
-    unsigned short __seq;
-    unsigned short __pad1;
-    unsigned long __unused1;
-    unsigned long __unused2;
+#elif defined(__sparc__)
+  unsigned mode;
+  unsigned short __pad2;
+  unsigned short __seq;
+  unsigned long long __unused1;
+  unsigned long long __unused2;
 #else
-    unsigned short mode;
-    unsigned short __pad1;
-    unsigned short __seq;
-    unsigned short __pad2;
+  unsigned int mode;
+  unsigned short __seq;
+  unsigned short __pad2;
 #if defined(__x86_64__) && !defined(_LP64)
     u64 __unused1;
     u64 __unused2;
p'>* gnu/packages/high-availability.scm (libqb)[native-inputs]: Remove autoconf, automake, and libtool. Tobias Geerinckx-Rice 2023-04-09gnu: haproxy: Update to 2.7.6....* gnu/packages/high-availability.scm (haproxy): Update to 2.7.6. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr> Yovan Naumovski 2023-03-26gnu: haproxy: Move to (gnu packages high-availability)....Copyright records were synchronized based on commit history. * gnu/packages/networking.scm (haproxy): Move this variable from here... * gnu/packages/high-availability.scm (haproxy): ...to here. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Sharlatan Hellseher 2022-10-10gnu: Add pacemaker....* gnu/pacemaker/high-availability.scm (pacemaker): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Sharlatan Hellseher 2022-10-10gnu: Add corosync....* gnu/packages/high-availability.scm (corosync): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Sharlatan Hellseher 2022-10-10gnu: Add kronosnet....* gnu/packages/high-availability.scm (kronosnet): New variable. Co-authored-by: Ludovic Courtès <ludo@gnu.org> Sharlatan Hellseher 2022-10-10gnu: libqb: Update to 2.0.6....* gnu/packages/high-availability.scm (libqb): Update to 2.0.6. Run `guix style' over the package. [native-inputs]: Add autoconf, automake, libtools to fix configure and build phases. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Sharlatan Hellseher 2022-10-10gnu: Move libqb to high-availability....* gnu/packages/hardware.scm (libqb): Move to high-availability.scm. * gnu/packages/high-availability.scm: New file. * gnu/local.mk: Add high-availability.scm to GNU_SYSTEM_MODULES list. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Sharlatan Hellseher