commit: 35a240ce948894dac099cdd8a4347ce89fba8855 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Dec 9 11:25:43 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Dec 9 11:29:18 2022 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=35a240ce
12.2.0: scrub patches Signed-off-by: Sam James <sam <AT> gentoo.org> 12.2.0/gentoo/09_all_nopie-all-flags.patch | 4 +-- 12.2.0/gentoo/10_all_sh-drop-sysroot-suffix.patch | 6 ----- 12.2.0/gentoo/11_all_ia64-TEXTREL.patch | 2 +- .../gentoo/12_all_disable-systemtap-switch.patch | 7 ----- ...ll_DEF_GENTOO_SCP-fstack-clash-protection.patch | 2 +- .../78_all_Factor-out-jobserver_active_p.patch | 17 ------------ ...-jobserver-style-fifo-for-recent-GNU-make.patch | 9 ------- ...spect-jobserver-in-parallel-WPA-streaming.patch | 12 --------- ...ix-fifo-mode-by-opening-pipe-in-proper-mo.patch | 6 ----- 12.2.0/musl/25_all_multilib_pure64.patch | 30 +++++++++------------- 12.2.0/musl/50_all_posix_memalign.patch | 5 ++-- 11 files changed, 18 insertions(+), 82 deletions(-) diff --git a/12.2.0/gentoo/09_all_nopie-all-flags.patch b/12.2.0/gentoo/09_all_nopie-all-flags.patch index 0f7c769..fe1cd80 100644 --- a/12.2.0/gentoo/09_all_nopie-all-flags.patch +++ b/12.2.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 @@ -1054,10 +1054,10 @@ ALL_CXXFLAGS = $(T_CFLAGS) $(CFLAGS-$@) ALL_CPPFLAGS = $(INCLUDES) $(CPPFLAGS) diff --git a/12.2.0/gentoo/10_all_sh-drop-sysroot-suffix.patch b/12.2.0/gentoo/10_all_sh-drop-sysroot-suffix.patch index fd3bda5..e778f81 100644 --- a/12.2.0/gentoo/10_all_sh-drop-sysroot-suffix.patch +++ b/12.2.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 <[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 @@ -3328,8 +3328,6 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ diff --git a/12.2.0/gentoo/11_all_ia64-TEXTREL.patch b/12.2.0/gentoo/11_all_ia64-TEXTREL.patch index 69347f5..f5d0a99 100644 --- a/12.2.0/gentoo/11_all_ia64-TEXTREL.patch +++ b/12.2.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.cc -+++ a/gcc/config/ia64/ia64.cc ++++ b/gcc/config/ia64/ia64.cc @@ -10840,12 +10840,14 @@ ia64_hpux_reloc_rw_mask (void) /* For others, relax this so that relocations to local data goes in diff --git a/12.2.0/gentoo/12_all_disable-systemtap-switch.patch b/12.2.0/gentoo/12_all_disable-systemtap-switch.patch index 4d69141..989036c 100644 --- a/12.2.0/gentoo/12_all_disable-systemtap-switch.patch +++ b/12.2.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 <[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 @@ -1015,6 +1015,7 @@ enable_gnu_unique_object diff --git a/12.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch b/12.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch index 1ed716b..b13215d 100644 --- a/12.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch +++ b/12.2.0/gentoo/24_all_DEF_GENTOO_SCP-fstack-clash-protection.patch @@ -1,7 +1,7 @@ We add -fstack-clash-protection if requested --- a/gcc/common.opt -+++ a/gcc/common.opt ++++ b/gcc/common.opt @@ -2698,7 +2698,7 @@ Common Alias(fstack-check=, specific, no Insert stack checking code into the program. Same as -fstack-check=specific. diff --git a/12.2.0/gentoo/78_all_Factor-out-jobserver_active_p.patch b/12.2.0/gentoo/78_all_Factor-out-jobserver_active_p.patch index b2f53f2..a4ae458 100644 --- a/12.2.0/gentoo/78_all_Factor-out-jobserver_active_p.patch +++ b/12.2.0/gentoo/78_all_Factor-out-jobserver_active_p.patch @@ -16,16 +16,6 @@ gcc/ChangeLog: (run_gcc): Likewise. * opts-jobserver.h: New file. * opts-common.cc (jobserver_info::jobserver_info): New function. ---- - gcc/gcc.cc | 38 +++++--------------------------------- - gcc/lto-wrapper.cc | 44 +++++++++----------------------------------- - gcc/opts-common.cc | 41 +++++++++++++++++++++++++++++++++++++++++ - gcc/opts-jobserver.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 99 insertions(+), 68 deletions(-) - create mode 100644 gcc/opts-jobserver.h - -diff --git a/gcc/gcc.cc b/gcc/gcc.cc -index bb07cc244e3..5699d3b51e5 100644 --- a/gcc/gcc.cc +++ b/gcc/gcc.cc @@ -27,6 +27,7 @@ CC recognizes how to compile each input file by suffixes in the file names. @@ -87,8 +77,6 @@ index bb07cc244e3..5699d3b51e5 100644 } /* Determine what the exit code of the driver should be. */ -diff --git a/gcc/lto-wrapper.cc b/gcc/lto-wrapper.cc -index d070829bacb..9fede90c277 100644 --- a/gcc/lto-wrapper.cc +++ b/gcc/lto-wrapper.cc @@ -37,6 +37,7 @@ along with GCC; see the file COPYING3. If not see @@ -183,8 +171,6 @@ index d070829bacb..9fede90c277 100644 print_lto_docs_link (); } else if (parallel == 0) -diff --git a/gcc/opts-common.cc b/gcc/opts-common.cc -index 1663be1f602..8a4d32de3e5 100644 --- a/gcc/opts-common.cc +++ b/gcc/opts-common.cc @@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License @@ -246,9 +232,6 @@ index 1663be1f602..8a4d32de3e5 100644 + if (!error_msg.empty ()) + error_msg = "jobserver is not available: " + error_msg; +} -diff --git a/gcc/opts-jobserver.h b/gcc/opts-jobserver.h -new file mode 100644 -index 00000000000..68ce188b84a --- /dev/null +++ b/gcc/opts-jobserver.h @@ -0,0 +1,44 @@ diff --git a/12.2.0/gentoo/79_all_lto-support-jobserver-style-fifo-for-recent-GNU-make.patch b/12.2.0/gentoo/79_all_lto-support-jobserver-style-fifo-for-recent-GNU-make.patch index 7cf09ed..aa76db7 100644 --- a/12.2.0/gentoo/79_all_lto-support-jobserver-style-fifo-for-recent-GNU-make.patch +++ b/12.2.0/gentoo/79_all_lto-support-jobserver-style-fifo-for-recent-GNU-make.patch @@ -13,13 +13,6 @@ gcc/ChangeLog: * opts-jobserver.h: Add one member. * opts-common.cc (jobserver_info::jobserver_info): Parse FIFO format of --jobserver-auth. ---- - gcc/opts-common.cc | 17 +++++++++++++++-- - gcc/opts-jobserver.h | 2 ++ - 2 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/gcc/opts-common.cc b/gcc/opts-common.cc -index 8a4d32de3e5..7c07d504696 100644 --- a/gcc/opts-common.cc +++ b/gcc/opts-common.cc @@ -2008,8 +2008,14 @@ void prepend_xassembler_to_collect_as_options (const char *collect_as_options, @@ -55,8 +48,6 @@ index 8a4d32de3e5..7c07d504696 100644 && rfd > 0 && wfd > 0 && is_valid_fd (rfd) -diff --git a/gcc/opts-jobserver.h b/gcc/opts-jobserver.h -index 68ce188b84a..98ea2579962 100644 --- a/gcc/opts-jobserver.h +++ b/gcc/opts-jobserver.h @@ -37,6 +37,8 @@ struct jobserver_info diff --git a/12.2.0/gentoo/80_all_lto-respect-jobserver-in-parallel-WPA-streaming.patch b/12.2.0/gentoo/80_all_lto-respect-jobserver-in-parallel-WPA-streaming.patch index 39ce61e..587d9f8 100644 --- a/12.2.0/gentoo/80_all_lto-respect-jobserver-in-parallel-WPA-streaming.patch +++ b/12.2.0/gentoo/80_all_lto-respect-jobserver-in-parallel-WPA-streaming.patch @@ -25,14 +25,6 @@ gcc/lto/ChangeLog: finishes. (stream_out_partitions): Use job server if active. (do_whole_program_analysis): Likewise. ---- - gcc/lto/lto.cc | 58 +++++++++++++++++++++++++++++++++----------- - gcc/opts-common.cc | 40 ++++++++++++++++++++++++++++++ - gcc/opts-jobserver.h | 14 +++++++++++ - 3 files changed, 98 insertions(+), 14 deletions(-) - -diff --git a/gcc/lto/lto.cc b/gcc/lto/lto.cc -index 31b0c1862f7..c82307f4f7e 100644 --- a/gcc/lto/lto.cc +++ b/gcc/lto/lto.cc @@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License @@ -152,8 +144,6 @@ index 31b0c1862f7..c82307f4f7e 100644 else { lto_parallelism = atoi (flag_wpa); -diff --git a/gcc/opts-common.cc b/gcc/opts-common.cc -index 7c07d504696..eed0eb7b799 100644 --- a/gcc/opts-common.cc +++ b/gcc/opts-common.cc @@ -2057,3 +2057,43 @@ jobserver_info::jobserver_info () @@ -200,8 +190,6 @@ index 7c07d504696..eed0eb7b799 100644 + char c = 'G'; + gcc_assert (write (fd, &c, 1) == 1); +} -diff --git a/gcc/opts-jobserver.h b/gcc/opts-jobserver.h -index 98ea2579962..76c1d9b2882 100644 --- a/gcc/opts-jobserver.h +++ b/gcc/opts-jobserver.h @@ -29,6 +29,18 @@ struct jobserver_info diff --git a/12.2.0/gentoo/81_all_jobserver-fix-fifo-mode-by-opening-pipe-in-proper-mo.patch b/12.2.0/gentoo/81_all_jobserver-fix-fifo-mode-by-opening-pipe-in-proper-mo.patch index ab63fe6..de5626f 100644 --- a/12.2.0/gentoo/81_all_jobserver-fix-fifo-mode-by-opening-pipe-in-proper-mo.patch +++ b/12.2.0/gentoo/81_all_jobserver-fix-fifo-mode-by-opening-pipe-in-proper-mo.patch @@ -15,12 +15,6 @@ gcc/ChangeLog: * opts-common.cc (jobserver_info::connect): Open fifo in non-blocking mode. ---- - gcc/opts-common.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/opts-common.cc b/gcc/opts-common.cc -index eed0eb7b799..98eb112cf68 100644 --- a/gcc/opts-common.cc +++ b/gcc/opts-common.cc @@ -2062,7 +2062,7 @@ void diff --git a/12.2.0/musl/25_all_multilib_pure64.patch b/12.2.0/musl/25_all_multilib_pure64.patch index 4ff0a25..d55c04c 100644 --- a/12.2.0/musl/25_all_multilib_pure64.patch +++ b/12.2.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/12.2.0/musl/50_all_posix_memalign.patch b/12.2.0/musl/50_all_posix_memalign.patch index a288e1d..dd75a93 100644 --- a/12.2.0/musl/50_all_posix_memalign.patch +++ b/12.2.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>
