commit:     92b359b0881663cd1b15b277bd4e393e743eff88
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  9 11:27:07 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec  9 11:29:17 2022 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=92b359b0

10.5.0: scrub patches

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

 .../gentoo/07_all_i386_libgcc_note.GNU-stack.patch | 24 ++++++++---------
 10.5.0/gentoo/10_all_nopie-all-flags.patch         |  4 +--
 10.5.0/gentoo/11_all_sh-drop-sysroot-suffix.patch  |  6 -----
 10.5.0/gentoo/12_all_ia64-TEXTREL.patch            |  2 +-
 .../gentoo/13_all_disable-systemtap-switch.patch   |  7 -----
 10.5.0/gentoo/14_all_m68k-textrel-on-libgcc.patch  |  6 -----
 10.5.0/gentoo/23_all_disable-riscv32-ABIs.patch    |  5 ++--
 10.5.0/gentoo/25_all_hppa-faster-synth_mult.patch  |  4 ---
 ...all_EXTRA_OPTIONS-fstack-clash-protection.patch | 16 ++++++------
 10.5.0/gentoo/31_all_fno-delayed-branch.patch      |  4 ---
 10.5.0/gentoo/32_all_vtv-slibtool.patch            |  4 ---
 10.5.0/musl/25_all_multilib_pure64.patch           | 30 +++++++++-------------
 10.5.0/musl/50_all_cpu_indicator.patch             |  9 -------
 10.5.0/musl/50_all_posix_memalign.patch            |  5 ++--
 .../nocross/50_all_libssp_unconditionally.patch    |  4 +--
 15 files changed, 41 insertions(+), 89 deletions(-)

diff --git a/10.5.0/gentoo/07_all_i386_libgcc_note.GNU-stack.patch 
b/10.5.0/gentoo/07_all_i386_libgcc_note.GNU-stack.patch
index 7f74945..63dbabb 100644
--- a/10.5.0/gentoo/07_all_i386_libgcc_note.GNU-stack.patch
+++ b/10.5.0/gentoo/07_all_i386_libgcc_note.GNU-stack.patch
@@ -1,5 +1,5 @@
---- a/libgcc/config/i386/resms64.h     2018-01-03 11:03:58.000000000 +0100
-+++ b/libgcc/config/i386/resms64.h     2018-05-01 12:59:48.942833419 +0200
+--- a/libgcc/config/i386/resms64.h
++++ b/libgcc/config/i386/resms64.h
 @@ -57,3 +57,6 @@ MS2SYSV_STUB_END(resms64_17)
  MS2SYSV_STUB_END(resms64_18)
  
@@ -7,8 +7,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- a/libgcc/config/i386/resms64f.h    2018-01-03 11:03:58.000000000 +0100
-+++ b/libgcc/config/i386/resms64f.h    2018-05-01 13:00:23.422832853 +0200
+--- a/libgcc/config/i386/resms64f.h
++++ b/libgcc/config/i386/resms64f.h
 @@ -55,3 +55,6 @@ MS2SYSV_STUB_END(resms64f_16)
  MS2SYSV_STUB_END(resms64f_17)
  
@@ -16,8 +16,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- a/libgcc/config/i386/resms64fx.h   2018-02-26 20:46:34.000000000 +0100
-+++ b/libgcc/config/i386/resms64fx.h   2018-05-01 13:06:49.682826518 +0200
+--- a/libgcc/config/i386/resms64fx.h
++++ b/libgcc/config/i386/resms64fx.h
 @@ -62,3 +62,6 @@ MS2SYSV_STUB_END(resms64fx_16)
  MS2SYSV_STUB_END(resms64fx_17)
  
@@ -25,8 +25,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- a/libgcc/config/i386/resms64x.h    2018-02-26 20:46:34.000000000 +0100
-+++ b/libgcc/config/i386/resms64x.h    2018-05-01 13:07:21.702825993 +0200
+--- a/libgcc/config/i386/resms64x.h
++++ b/libgcc/config/i386/resms64x.h
 @@ -63,3 +63,6 @@ MS2SYSV_STUB_END(resms64x_17)
  MS2SYSV_STUB_END(resms64x_18)
  
@@ -34,8 +34,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- a/libgcc/config/i386/savms64.h     2018-01-03 11:03:58.000000000 +0100
-+++ b/libgcc/config/i386/savms64.h     2018-05-01 13:07:48.952825546 +0200
+--- a/libgcc/config/i386/savms64.h
++++ b/libgcc/config/i386/savms64.h
 @@ -57,3 +57,6 @@ MS2SYSV_STUB_END(savms64_17)
  MS2SYSV_STUB_END(savms64_18)
  
@@ -43,8 +43,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
---- a/libgcc/config/i386/savms64f.h    2018-01-03 11:03:58.000000000 +0100
-+++ b/libgcc/config/i386/savms64f.h    2018-05-01 13:08:30.082824871 +0200
+--- a/libgcc/config/i386/savms64f.h
++++ b/libgcc/config/i386/savms64f.h
 @@ -55,3 +55,6 @@ MS2SYSV_STUB_END(savms64f_16)
  MS2SYSV_STUB_END(savms64f_17)
  

diff --git a/10.5.0/gentoo/10_all_nopie-all-flags.patch 
b/10.5.0/gentoo/10_all_nopie-all-flags.patch
index 48536e6..5563182 100644
--- a/10.5.0/gentoo/10_all_nopie-all-flags.patch
+++ b/10.5.0/gentoo/10_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/10.5.0/gentoo/11_all_sh-drop-sysroot-suffix.patch 
b/10.5.0/gentoo/11_all_sh-drop-sysroot-suffix.patch
index 3dadd4c..b1c3591 100644
--- a/10.5.0/gentoo/11_all_sh-drop-sysroot-suffix.patch
+++ b/10.5.0/gentoo/11_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 <[email protected]>
----
- 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/10.5.0/gentoo/12_all_ia64-TEXTREL.patch 
b/10.5.0/gentoo/12_all_ia64-TEXTREL.patch
index 706dbe5..5059e4d 100644
--- a/10.5.0/gentoo/12_all_ia64-TEXTREL.patch
+++ b/10.5.0/gentoo/12_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/10.5.0/gentoo/13_all_disable-systemtap-switch.patch 
b/10.5.0/gentoo/13_all_disable-systemtap-switch.patch
index d5ae8d0..d4ecefa 100644
--- a/10.5.0/gentoo/13_all_disable-systemtap-switch.patch
+++ b/10.5.0/gentoo/13_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 <[email protected]>
----
- 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/10.5.0/gentoo/14_all_m68k-textrel-on-libgcc.patch 
b/10.5.0/gentoo/14_all_m68k-textrel-on-libgcc.patch
index a2aa100..4cb8350 100644
--- a/10.5.0/gentoo/14_all_m68k-textrel-on-libgcc.patch
+++ b/10.5.0/gentoo/14_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 <[email protected]>
----
- 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/10.5.0/gentoo/23_all_disable-riscv32-ABIs.patch 
b/10.5.0/gentoo/23_all_disable-riscv32-ABIs.patch
index ad0128a..8bffc72 100644
--- a/10.5.0/gentoo/23_all_disable-riscv32-ABIs.patch
+++ b/10.5.0/gentoo/23_all_disable-riscv32-ABIs.patch
@@ -1,9 +1,8 @@
 Autogenerated patch disabling the 32bit RISCV support
 See https://gcc.gnu.org/PR90419
 
-diff -ruN gcc-9.1.0.orig/gcc/config/riscv/t-linux-multilib 
gcc-9.1.0/gcc/config/riscv/t-linux-multilib
---- gcc-9.1.0.orig/gcc/config/riscv/t-linux-multilib   2017-02-06 
22:38:37.000000000 +0100
-+++ gcc-9.1.0/gcc/config/riscv/t-linux-multilib        2019-05-18 
23:04:54.849400774 +0200
+--- a/gcc/config/riscv/t-linux-multilib
++++ b/gcc/config/riscv/t-linux-multilib
 @@ -1,40 +1,18 @@
  # This file was generated by multilib-generator with the command:
 -#  ./multilib-generator 
rv32imac-ilp32-rv32ima,rv32imaf,rv32imafd,rv32imafc,rv32imafdc- 
rv32imafdc-ilp32d-rv32imafd- 
rv64imac-lp64-rv64ima,rv64imaf,rv64imafd,rv64imafc,rv64imafdc- 
rv64imafdc-lp64d-rv64imafd-

diff --git a/10.5.0/gentoo/25_all_hppa-faster-synth_mult.patch 
b/10.5.0/gentoo/25_all_hppa-faster-synth_mult.patch
index e93aa40..e9584e3 100644
--- a/10.5.0/gentoo/25_all_hppa-faster-synth_mult.patch
+++ b/10.5.0/gentoo/25_all_hppa-faster-synth_mult.patch
@@ -13,10 +13,6 @@ algorithm. xxhash is especially hevyweight as it's a
 
 Bug: https://gcc.gnu.org/PR87256
 Signed-off-by: Sergei Trofimovich <[email protected]>
----
- gcc/expmed.h | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
 --- a/gcc/expmed.h
 +++ b/gcc/expmed.h
 @@ -127,11 +127,14 @@ struct alg_hash_entry {

diff --git a/10.5.0/gentoo/28_all_EXTRA_OPTIONS-fstack-clash-protection.patch 
b/10.5.0/gentoo/28_all_EXTRA_OPTIONS-fstack-clash-protection.patch
index d1bb202..e821c03 100644
--- a/10.5.0/gentoo/28_all_EXTRA_OPTIONS-fstack-clash-protection.patch
+++ b/10.5.0/gentoo/28_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/10.5.0/gentoo/31_all_fno-delayed-branch.patch 
b/10.5.0/gentoo/31_all_fno-delayed-branch.patch
index 33ff2f4..35ba99e 100644
--- a/10.5.0/gentoo/31_all_fno-delayed-branch.patch
+++ b/10.5.0/gentoo/31_all_fno-delayed-branch.patch
@@ -13,10 +13,6 @@ Reported-by: Jeroen Roovers
 Bug: https://gcc.gnu.org/PR96015
 Bug: https://bugs.gentoo.org/729570.
 Signed-off-by: Sergei Trofimovich <[email protected]>
----
- gcc/opts.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
 --- a/gcc/opts.c
 +++ b/gcc/opts.c
 @@ -458,7 +458,14 @@ static const struct default_options 
default_options_table[] =

diff --git a/10.5.0/gentoo/32_all_vtv-slibtool.patch 
b/10.5.0/gentoo/32_all_vtv-slibtool.patch
index b5716f9..a804ff7 100644
--- a/10.5.0/gentoo/32_all_vtv-slibtool.patch
+++ b/10.5.0/gentoo/32_all_vtv-slibtool.patch
@@ -18,10 +18,6 @@ libtool just removes that piece).
 
 This patch updates the libstdc++-v3 Makefiles to not pass
 "-fvtable-verify=std" to the libtool link commands.
----
- libstdc++-v3/src/Makefile.am | 4 +++-
- libstdc++-v3/src/Makefile.in | 3 ++-
-
 --- a/libstdc++-v3/src/Makefile.am
 +++ b/libstdc++-v3/src/Makefile.am
 @@ -214,12 +214,14 @@ compatibility-condvar.o: compatibility-condvar.cc

diff --git a/10.5.0/musl/25_all_multilib_pure64.patch 
b/10.5.0/musl/25_all_multilib_pure64.patch
index 19fd5c9..2442652 100644
--- a/10.5.0/musl/25_all_multilib_pure64.patch
+++ b/10.5.0/musl/25_all_multilib_pure64.patch
@@ -1,6 +1,5 @@
-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
  
@@ -10,9 +9,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))
@@ -23,9 +21,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)))
@@ -46,9 +43,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
@@ -60,9 +56,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
@@ -72,9 +67,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/10.5.0/musl/50_all_cpu_indicator.patch 
b/10.5.0/musl/50_all_cpu_indicator.patch
index 6141a83..060b322 100644
--- a/10.5.0/musl/50_all_cpu_indicator.patch
+++ b/10.5.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/10.5.0/musl/50_all_posix_memalign.patch 
b/10.5.0/musl/50_all_posix_memalign.patch
index a288e1d..dd75a93 100644
--- a/10.5.0/musl/50_all_posix_memalign.patch
+++ b/10.5.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/10.5.0/musl/nocross/50_all_libssp_unconditionally.patch 
b/10.5.0/musl/nocross/50_all_libssp_unconditionally.patch
index 7e4c58a..42796f2 100644
--- a/10.5.0/musl/nocross/50_all_libssp_unconditionally.patch
+++ b/10.5.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

Reply via email to