11.4.0: scrub patches

Signed-off-by: Sam James <sam@gentoo.org>

12 files changed, 27 insertions, 87 deletions

diff --git a/11.4.0/gentoo/09_all_nopie-all-flags.patch b/11.4.0/gentoo/09_all_nopie-all-flags.patch
index 48536e6..5563182 100644
--- a/11.4.0/gentoo/09_all_nopie-all-flags.patch
+++ b/11.4.0/gentoo/09_all_nopie-all-flags.patch
@@ -1,8 +1,8 @@
 We need to pass NO_PIE_CFLAGS to ALL_* so gcc don't fail when
 we compile it with older gcc and pie.
 
---- a/gcc/Makefile.in	2015-06-25 19:18:12.000000000 +0200
-+++ b/gcc/Makefile.in	2016-04-22 00:12:54.029178860 +0200
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
 @@ -991,10 +991,10 @@ ALL_CXXFLAGS = $(T_CFLAGS) $(CFLAGS-$@)
  ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS)
  
diff --git a/11.4.0/gentoo/10_all_sh-drop-sysroot-suffix.patch b/11.4.0/gentoo/10_all_sh-drop-sysroot-suffix.patch
index 3dadd4c..b1c3591 100644
--- a/11.4.0/gentoo/10_all_sh-drop-sysroot-suffix.patch
+++ b/11.4.0/gentoo/10_all_sh-drop-sysroot-suffix.patch
@@ -10,12 +10,6 @@ multilib flavour always prepends sysroot-prefix.
 Bug: https://bugs.gentoo.org/511548
 Bug: https://gcc.gnu.org/PR42947
 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- gcc/config.gcc | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 55c314afdbd..c320f24f123 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
 @@ -2866,8 +2866,6 @@ sh-*-elf* | sh[12346l]*-*-elf* | \
diff --git a/11.4.0/gentoo/11_all_ia64-TEXTREL.patch b/11.4.0/gentoo/11_all_ia64-TEXTREL.patch
index 706dbe5..5059e4d 100644
--- a/11.4.0/gentoo/11_all_ia64-TEXTREL.patch
+++ b/11.4.0/gentoo/11_all_ia64-TEXTREL.patch
@@ -2,7 +2,7 @@ Fix textrels on -rdynamic binaries:
 Bug: https://gcc.gnu.org/PR84553
 Bug: https://bugs.gentoo.org/566118
 --- a/gcc/config/ia64/ia64.c
-+++ a/gcc/config/ia64/ia64.c
++++ b/gcc/config/ia64/ia64.c
 @@ -10838,12 +10838,14 @@ ia64_hpux_reloc_rw_mask (void)
  
  /* For others, relax this so that relocations to local data goes in
diff --git a/11.4.0/gentoo/12_all_disable-systemtap-switch.patch b/11.4.0/gentoo/12_all_disable-systemtap-switch.patch
index d5ae8d0..d4ecefa 100644
--- a/11.4.0/gentoo/12_all_disable-systemtap-switch.patch
+++ b/11.4.0/gentoo/12_all_disable-systemtap-switch.patch
@@ -13,13 +13,6 @@ discovery.
 Bug: https://bugs.gentoo.org/654748
 Bug: https://gcc.gnu.org/bugzilla/PR61257
 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- gcc/configure    | 34 ++++++++++++++++++++++++++--------
- gcc/configure.ac | 30 ++++++++++++++++++++++--------
- 2 files changed, 48 insertions(+), 16 deletions(-)
-
-diff --git a/gcc/configure b/gcc/configure
-index 3dcf7752b..c2049f117 100755
 --- a/gcc/configure
 +++ b/gcc/configure
 @@ -988,6 +988,7 @@ enable_gnu_unique_object
diff --git a/11.4.0/gentoo/13_all_m68k-textrel-on-libgcc.patch b/11.4.0/gentoo/13_all_m68k-textrel-on-libgcc.patch
index a2aa100..4cb8350 100644
--- a/11.4.0/gentoo/13_all_m68k-textrel-on-libgcc.patch
+++ b/11.4.0/gentoo/13_all_m68k-textrel-on-libgcc.patch
@@ -6,12 +6,6 @@ Date: Sat, 28 Jul 2018 11:33:27 +0100
 Subject: [PATCH] libgcc: m68k: avoid absolute relocation in shared library
 
 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- libgcc/config/m68k/lb1sf68.S | 19 ++++++++++++++-----
- 1 file changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/libgcc/config/m68k/lb1sf68.S b/libgcc/config/m68k/lb1sf68.S
-index 325a7c17d9b..16c6dc3f5a7 100644
 --- a/libgcc/config/m68k/lb1sf68.S
 +++ b/libgcc/config/m68k/lb1sf68.S
 @@ -435,7 +435,10 @@ $_exception_handler:
diff --git a/11.4.0/gentoo/23_all_EXTRA_OPTIONS-fstack-clash-protection.patch b/11.4.0/gentoo/23_all_EXTRA_OPTIONS-fstack-clash-protection.patch
index e836c92..1db9de1 100644
--- a/11.4.0/gentoo/23_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+++ b/11.4.0/gentoo/23_all_EXTRA_OPTIONS-fstack-clash-protection.patch
@@ -1,7 +1,7 @@
 On Hardened we add some options like -fstack-clash-protection.
 
---- a/gcc/common.opt	2018-03-28 16:51:09.000000000 +0200
-+++ a/gcc/common.opt	2018-04-30 15:35:55.274096877 +0200
+--- a/gcc/common.opt
++++ b/gcc/common.opt
 @@ -2367,7 +2367,7 @@ Common Alias(fstack-check=, specific, no
  Insert stack checking code into the program.  Same as -fstack-check=specific.
  
@@ -11,8 +11,8 @@ On Hardened we add some options like -fstack-clash-protection.
  Insert code to probe each page of stack space as it is allocated to protect
  from stack-clash style attacks.
  
---- a/gcc/defaults.h	2018-01-03 11:03:58.000000000 +0100
-+++ b/gcc/defaults.h	2018-05-01 12:41:29.522851451 +0200
+--- a/gcc/defaults.h
++++ b/gcc/defaults.h
 @@ -1435,6 +1435,15 @@ see the files COPYING3 and COPYING.RUNTI
  #define STACK_CHECK_MAX_VAR_SIZE (STACK_CHECK_MAX_FRAME_SIZE / 100)
  #endif
@@ -29,8 +29,8 @@ On Hardened we add some options like -fstack-clash-protection.
  /* By default, the C++ compiler will use function addresses in the
     vtable entries.  Setting this nonzero tells the compiler to use
     function descriptors instead.  The value of this macro says how
---- a/gcc/toplev.c	2018-02-13 17:18:37.000000000 +0100
-+++ b/gcc/toplev.c	2018-04-30 16:46:37.244027303 +0200
+--- a/gcc/toplev.c
++++ b/gcc/toplev.c
 @@ -1682,6 +1682,10 @@ process_options (void)
  
    /* -fstack-clash-protection is not currently supported on targets
@@ -43,8 +43,8 @@ On Hardened we add some options like -fstack-clash-protection.
      {
        warning_at (UNKNOWN_LOCATION, 0,
 
---- a/libgcc/Makefile.in	2011-11-22 04:01:02.000000000 +0100
-+++ b/libgcc/Makefile.in	2011-12-25 15:18:22.449610631 +0100
+--- a/libgcc/Makefile.in
++++ b/libgcc/Makefile.in
 @@ -225,7 +225,7 @@ endif
  LIBGCC2_DEBUG_CFLAGS = -g
  LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \
diff --git a/11.4.0/gentoo/26_all_enable-cet.patch b/11.4.0/gentoo/26_all_enable-cet.patch
index 38bb34a..75f9c8b 100644
--- a/11.4.0/gentoo/26_all_enable-cet.patch
+++ b/11.4.0/gentoo/26_all_enable-cet.patch
@@ -9,13 +9,6 @@ Needs:
 
   Only supported on amd64.
 
----
- gcc/config/i386/i386-options.c |  3 +++
- gcc/defaults.h                 | 13 +++++++++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/gcc/config/i386/i386-options.c b/gcc/config/i386/i386-options.c
-index 19632b5..fac61af 100644
 --- a/gcc/config/i386/i386-options.c
 +++ b/gcc/config/i386/i386-options.c
 @@ -3049,6 +3049,9 @@ ix86_option_override_internal (bool main_args_p,
@@ -28,8 +21,6 @@ index 19632b5..fac61af 100644
    if (opts->x_flag_cf_protection != CF_NONE)
      {
        if ((opts->x_flag_cf_protection & CF_BRANCH) == CF_BRANCH
-diff --git a/gcc/defaults.h b/gcc/defaults.h
-index 0f6cd78..5694412 100644
 --- a/gcc/defaults.h
 +++ b/gcc/defaults.h
 @@ -1463,6 +1463,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
diff --git a/11.4.0/gentoo/75_all_x86_PR99703_12_no-cet-for-i486.patch b/11.4.0/gentoo/75_all_x86_PR99703_12_no-cet-for-i486.patch
index 5d3afc1..f953e09 100644
--- a/11.4.0/gentoo/75_all_x86_PR99703_12_no-cet-for-i486.patch
+++ b/11.4.0/gentoo/75_all_x86_PR99703_12_no-cet-for-i486.patch
@@ -19,8 +19,6 @@ config/
 All applicable configure scripts have been regenerated. Patch hunks
 which only updated line numbers have been excluded to reduce conflicts.
 
-diff --git a/config/cet.m4 b/config/cet.m4
-index c67fb4f35b6..7718be1afe8 100644
 --- a/config/cet.m4
 +++ b/config/cet.m4
 @@ -130,6 +130,18 @@ fi
@@ -56,8 +54,6 @@ index c67fb4f35b6..7718be1afe8 100644
      if test x$enable_cet = xno -a x$have_cet = xyes; then
        AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])
      fi
-diff --git a/gcc/configure b/gcc/configure
-index 708328e1670..e6e4d9e270e 100755
 --- a/gcc/configure
 +++ b/gcc/configure
 @@ -32416,6 +32416,34 @@ else
@@ -103,8 +99,6 @@ index 708328e1670..e6e4d9e270e 100755
      if test x$enable_cet = xno -a x$have_cet = xyes; then
        as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
      fi
-diff --git a/libbacktrace/configure b/libbacktrace/configure
-index 9b66bf5563a..a2f33c0f35d 100755
 --- a/libbacktrace/configure
 +++ b/libbacktrace/configure
 @@ -12517,6 +12517,34 @@ else
@@ -150,8 +144,6 @@ index 9b66bf5563a..a2f33c0f35d 100755
      if test x$enable_cet = xno -a x$have_cet = xyes; then
        as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
      fi
-diff --git a/libcc1/configure b/libcc1/configure
-index 600e41cf5ea..b198b0b9074 100755
 --- a/libcc1/configure
 +++ b/libcc1/configure
 @@ -14653,6 +14653,34 @@ else
@@ -197,8 +189,6 @@ index 600e41cf5ea..b198b0b9074 100755
      if test x$enable_cet = xno -a x$have_cet = xyes; then
        as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
      fi
-diff --git a/libcpp/configure b/libcpp/configure
-index 7e28606f605..9674cd9c7a7 100755
 --- a/libcpp/configure
 +++ b/libcpp/configure
 @@ -7668,6 +7668,34 @@ else
@@ -244,8 +234,6 @@ index 7e28606f605..9674cd9c7a7 100755
      if test x$enable_cet = xno -a x$have_cet = xyes; then
        as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
      fi
-diff --git a/libdecnumber/configure b/libdecnumber/configure
-index 6b62f8ba665..da5302f9315 100755
 --- a/libdecnumber/configure
 +++ b/libdecnumber/configure
 @@ -5321,6 +5321,34 @@ else
@@ -291,8 +279,6 @@ index 6b62f8ba665..da5302f9315 100755
      if test x$enable_cet = xno -a x$have_cet = xyes; then
        as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
      fi
-diff --git a/libiberty/configure b/libiberty/configure
-index 61c62a33b3a..14a555c4ed6 100755
 --- a/libiberty/configure
 +++ b/libiberty/configure
 @@ -5396,6 +5396,34 @@ else
@@ -338,8 +324,6 @@ index 61c62a33b3a..14a555c4ed6 100755
      if test x$enable_cet = xno -a x$have_cet = xyes; then
        as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
      fi
-diff --git a/lto-plugin/configure b/lto-plugin/configure
-index 22a4357a58e..26aad9dd699 100755
 --- a/lto-plugin/configure
 +++ b/lto-plugin/configure
 @@ -5791,6 +5791,34 @@ else
diff --git a/11.4.0/musl/25_all_multilib_pure64.patch b/11.4.0/musl/25_all_multilib_pure64.patch
index 4ff0a25..d55c04c 100644
--- a/11.4.0/musl/25_all_multilib_pure64.patch
+++ b/11.4.0/musl/25_all_multilib_pure64.patch
@@ -1,9 +1,8 @@
 https://bugs.gentoo.org/675954
 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90077
 
-diff -Naur gcc-9.3.0.orig/gcc/config/aarch64/t-aarch64-linux gcc-9.3.0/gcc/config/aarch64/t-aarch64-linux
---- gcc-9.3.0.orig/gcc/config/aarch64/t-aarch64-linux	2020-10-05 02:59:12.767988285 -0700
-+++ gcc-9.3.0/gcc/config/aarch64/t-aarch64-linux	2020-10-05 03:03:32.310816444 -0700
+--- a/gcc/config/aarch64/t-aarch64-linux
++++ b/gcc/config/aarch64/t-aarch64-linux
 @@ -22,7 +22,7 @@
  LIB1ASMFUNCS = _aarch64_sync_cache_range
  
@@ -13,9 +12,8 @@ diff -Naur gcc-9.3.0.orig/gcc/config/aarch64/t-aarch64-linux gcc-9.3.0/gcc/confi
  MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
  
  MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
-diff -Naur gcc-9.3.0.orig/gcc/config/i386/t-linux64 gcc-9.3.0/gcc/config/i386/t-linux64
---- gcc-9.3.0.orig/gcc/config/i386/t-linux64	2020-10-05 02:59:12.757989347 -0700
-+++ gcc-9.3.0/gcc/config/i386/t-linux64	2020-10-05 03:24:58.878825272 -0700
+--- a/gcc/config/i386/t-linux64
++++ b/gcc/config/i386/t-linux64
 @@ -33,6 +33,6 @@
  comma=,
  MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
@@ -26,9 +24,8 @@ diff -Naur gcc-9.3.0.orig/gcc/config/i386/t-linux64 gcc-9.3.0/gcc/config/i386/t-
 +MULTILIB_OSDIRNAMES = m64=../lib
 +MULTILIB_OSDIRNAMES+= m32=../lib32
 +MULTILIB_OSDIRNAMES+= mx32=../libx32
-diff -Naur gcc-9.3.0.orig/gcc/config/rs6000/t-linux gcc-9.3.0/gcc/config/rs6000/t-linux
---- gcc-9.3.0.orig/gcc/config/rs6000/t-linux	2020-10-05 02:59:12.767988285 -0700
-+++ gcc-9.3.0/gcc/config/rs6000/t-linux	2020-10-05 03:03:32.310816444 -0700
+--- a/gcc/config/rs6000/t-linux
++++ b/gcc/config/rs6000/t-linux
 @@ -2,7 +2,8 @@
  # or soft-float.
  ifeq (,$(filter $(with_cpu),$(SOFT_FLOAT_CPUS))$(findstring soft,$(with_float)))
@@ -49,9 +46,8 @@ diff -Naur gcc-9.3.0.orig/gcc/config/rs6000/t-linux gcc-9.3.0/gcc/config/rs6000/
  endif
  endif
  
-diff -Naur gcc-9.3.0.orig/gcc/config/rs6000/t-linux64 gcc-9.3.0/gcc/config/rs6000/t-linux64
---- gcc-9.3.0.orig/gcc/config/rs6000/t-linux64	2020-10-05 02:59:12.767988285 -0700
-+++ gcc-9.3.0/gcc/config/rs6000/t-linux64	2020-10-05 03:03:32.310816444 -0700
+--- a/gcc/config/rs6000/t-linux64
++++ b/gcc/config/rs6000/t-linux64
 @@ -28,8 +28,8 @@
  MULTILIB_OPTIONS    := m64/m32
  MULTILIB_DIRNAMES   := 64 32
@@ -63,9 +59,8 @@ diff -Naur gcc-9.3.0.orig/gcc/config/rs6000/t-linux64 gcc-9.3.0/gcc/config/rs600
  
  rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
  	$(COMPILE) $<
-diff -Naur gcc-9.3.0.orig/gcc/config/rs6000/t-linux64bele gcc-9.3.0/gcc/config/rs6000/t-linux64bele
---- gcc-9.3.0.orig/gcc/config/rs6000/t-linux64bele	2020-10-05 02:59:12.767988285 -0700
-+++ gcc-9.3.0/gcc/config/rs6000/t-linux64bele	2020-10-05 03:03:32.310816444 -0700
+--- a/gcc/config/rs6000/t-linux64bele
++++ b/gcc/config/rs6000/t-linux64bele
 @@ -2,6 +2,6 @@
  
  MULTILIB_OPTIONS    += mlittle
@@ -75,9 +70,8 @@ diff -Naur gcc-9.3.0.orig/gcc/config/rs6000/t-linux64bele gcc-9.3.0/gcc/config/r
 +MULTILIB_OSDIRNAMES = m64=../lib
 +MULTILIB_OSDIRNAMES+= m32=../lib32
  MULTILIB_MATCHES    := ${MULTILIB_MATCHES_ENDIAN}
-diff -Naur gcc-9.3.0.orig/gcc/config/rs6000/t-linux64lebe gcc-9.3.0/gcc/config/rs6000/t-linux64lebe
---- gcc-9.3.0.orig/gcc/config/rs6000/t-linux64lebe	2020-10-05 02:59:12.777987222 -0700
-+++ gcc-9.3.0/gcc/config/rs6000/t-linux64lebe	2020-10-05 03:03:32.310816444 -0700
+--- a/gcc/config/rs6000/t-linux64lebe
++++ b/gcc/config/rs6000/t-linux64lebe
 @@ -2,6 +2,6 @@
  
  MULTILIB_OPTIONS    += mbig
diff --git a/11.4.0/musl/50_all_cpu_indicator.patch b/11.4.0/musl/50_all_cpu_indicator.patch
index 6141a83..060b322 100644
--- a/11.4.0/musl/50_all_cpu_indicator.patch
+++ b/11.4.0/musl/50_all_cpu_indicator.patch
@@ -4,13 +4,6 @@ Date: Thu, 7 May 2020 21:14:11 -0500
 Subject: [PATCH] convert "__cpu_indicator_init" to
  "__cpu_indicator_init_local"
 
----
- gcc/config/i386/i386-expand.c | 4 ++--
- libgcc/config/i386/cpuinfo.c  | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/gcc/config/i386/i386-expand.c b/gcc/config/i386/i386-expand.c
-index 48f00c5fc..78650b202 100644
 --- a/gcc/config/i386/i386-expand.c
 +++ b/gcc/config/i386/i386-expand.c
 @@ -10941,10 +10941,10 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
@@ -26,8 +19,6 @@ index 48f00c5fc..78650b202 100644
  	call_expr = build_call_expr (fndecl, 0); 
  	return expand_expr (call_expr, target, mode, EXPAND_NORMAL);
        }
-diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
-index 00322c586..f42bbb8af 100644
 --- a/libgcc/config/i386/cpuinfo.c
 +++ b/libgcc/config/i386/cpuinfo.c
 @@ -508,7 +508,7 @@ __cpu_indicator_init (void)
diff --git a/11.4.0/musl/50_all_posix_memalign.patch b/11.4.0/musl/50_all_posix_memalign.patch
index a288e1d..dd75a93 100644
--- a/11.4.0/musl/50_all_posix_memalign.patch
+++ b/11.4.0/musl/50_all_posix_memalign.patch
@@ -1,6 +1,5 @@
-diff -Naur gcc-7.1.0.orig/gcc/config/i386/pmm_malloc.h gcc-7.1.0/gcc/config/i386/pmm_malloc.h
---- gcc-7.1.0.orig/gcc/config/i386/pmm_malloc.h	2017-01-01 04:07:43.000000000 -0800
-+++ gcc-7.1.0/gcc/config/i386/pmm_malloc.h	2017-05-07 11:35:22.878398460 -0700
+--- a/gcc/config/i386/pmm_malloc.h
++++ b/gcc/config/i386/pmm_malloc.h
 @@ -27,12 +27,13 @@
  #include <stdlib.h>
  
diff --git a/11.4.0/musl/nocross/50_all_libssp_unconditionally.patch b/11.4.0/musl/nocross/50_all_libssp_unconditionally.patch
index 7e4c58a..42796f2 100644
--- a/11.4.0/musl/nocross/50_all_libssp_unconditionally.patch
+++ b/11.4.0/musl/nocross/50_all_libssp_unconditionally.patch
@@ -10,8 +10,8 @@ case when bootstrapping gcc, the piepatches do not seem to fully fix the
 crosstoolchain and  bootstrap sequence wrt. stack-protector flag usage."
 
 (We do the same in Gentoo.)
---- gcc-6.1.0/gcc/gcc.c.orig
-+++ gcc-6.1.0/gcc/gcc.c
+--- a/gcc/gcc.c.orig
++++ b/gcc/gcc.c
 @@ -870,8 +870,7 @@
  
  #ifndef LINK_SSP_SPEC