02/02: gnu: GCC@9: Remove obsolete patch.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit dd4e4b037665f762e9d066af00f2e57a92c2e3bf
Author: Marius Bakke <address@hidden>
AuthorDate: Wed Mar 18 19:45:16 2020 +0100

    gnu: GCC@9: Remove obsolete patch.
    
    This patch became obsolete when the update to 9.3.0 was merged (commit 
3dade1d59e7b4caa641670a76c0c48b4c90f6b3c).
    
    * gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
    * gnu/packages/gcc.scm (gcc-9)[source](patches): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/gcc.scm                               |  1 -
 .../patches/gcc-9-libsanitizer-mode-size.patch     | 58 ----------------------
 3 files changed, 60 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 25f017b..f8414ec 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -898,7 +898,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/gcc-6-libsanitizer-mode-size.patch      \
   %D%/packages/patches/gcc-7-libsanitizer-mode-size.patch      \
   %D%/packages/patches/gcc-8-libsanitizer-mode-size.patch      \
-  %D%/packages/patches/gcc-9-libsanitizer-mode-size.patch      \
   %D%/packages/patches/gcc-libvtv-runpath.patch                        \
   %D%/packages/patches/gcc-strmov-store-file-names.patch       \
   %D%/packages/patches/gcc-4-compile-with-gcc-5.patch           \
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 09367d8..f465470 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -560,7 +560,6 @@ It also includes runtime support libraries for these 
languages.")))
              (base32
               "1la2yy27ziasyf0jvzk58y1i5b5bq2h176qil550bxhifs39gqbi"))
             (patches (search-patches "gcc-9-strmov-store-file-names.patch"
-                                     "gcc-9-libsanitizer-mode-size.patch"
                                      "gcc-9-asan-fix-limits-include.patch"
                                      "gcc-5.0-libvtv-runpath.patch"))))))
 
diff --git a/gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch 
b/gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch
deleted file mode 100644
index 9e99a3d..0000000
--- a/gnu/packages/patches/gcc-9-libsanitizer-mode-size.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Fix assertion failure in libsanitizer when using glibc 2.31 and later.
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92154
-https://reviews.llvm.org/D69104
-
-This is a combination of these upstream revisions:
-
-https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=277981
-https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=279653
-
-diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 
b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-index 6cd4a5bac8b..d823a12190c 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -1156,8 +1156,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/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h 
b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
-index 73af92af1e8..6a673a7c995 100644
---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
-+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
-@@ -211,26 +211,13 @@ namespace __sanitizer {
-     u64 __unused1;
-     u64 __unused2;
- #elif defined(__sparc__)
--#if defined(__arch64__)
-     unsigned mode;
--    unsigned short __pad1;
--#else
--    unsigned short __pad1;
--    unsigned short mode;
-     unsigned short __pad2;
--#endif
-     unsigned short __seq;
-     unsigned long long __unused1;
-     unsigned long long __unused2;
--#elif defined(__mips__) || defined(__aarch64__) || defined(__s390x__)
--    unsigned int mode;
--    unsigned short __seq;
--    unsigned short __pad1;
--    unsigned long __unused1;
--    unsigned long __unused2;
- #else
--    unsigned short mode;
--    unsigned short __pad1;
-+    unsigned int mode;
-     unsigned short __seq;
-     unsigned short __pad2;
- #if defined(__x86_64__) && !defined(_LP64)