13.2.0: rebase patches

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

5 files changed, 38 insertions, 33 deletions

diff --git a/13.2.0/gentoo/87_all_Remove-DEFAULT_MATCHPD_PARTITIONS-macro.patch b/13.2.0/gentoo/87_all_Remove-DEFAULT_MATCHPD_PARTITIONS-macro.patch
index 5cbeb48..5e6a81d 100644
--- a/13.2.0/gentoo/87_all_Remove-DEFAULT_MATCHPD_PARTITIONS-macro.patch
+++ b/13.2.0/gentoo/87_all_Remove-DEFAULT_MATCHPD_PARTITIONS-macro.patch
@@ -1,9 +1,9 @@
 https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=bc45e18d433f879a02e369d027829f90f9e85724
 
-From f68becb26d43428a8e35ff2528c2bce719a7bb0a Mon Sep 17 00:00:00 2001
+From e351a8c9975b93e3e98e52342cb77b6a2969257f Mon Sep 17 00:00:00 2001
 From: Tamar Christina <tamar.christina@arm.com>
 Date: Mon, 12 Jun 2023 14:06:08 +0100
-Subject: [PATCH 2/6] Remove DEFAULT_MATCHPD_PARTITIONS macro
+Subject: [PATCH 10/14] Remove DEFAULT_MATCHPD_PARTITIONS macro
 
 As Jakub pointed out, DEFAULT_MATCHPD_PARTITIONS
 is now unused and can be removed.
@@ -21,10 +21,10 @@ gcc/ChangeLog:
  2 files changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/gcc/configure b/gcc/configure
-index 843fd5449dd..3750f77fd03 100755
+index 2c124f1b0337..61c18a13ab7b 100755
 --- a/gcc/configure
 +++ b/gcc/configure
-@@ -7908,11 +7908,6 @@ if (test $DEFAULT_MATCHPD_PARTITIONS -lt 1); then
+@@ -7914,11 +7914,6 @@ if (test $DEFAULT_MATCHPD_PARTITIONS -lt 1); then
  fi
  
  
@@ -36,26 +36,26 @@ index 843fd5449dd..3750f77fd03 100755
  
  # Enable __cxa_atexit for C++.
  # Check whether --enable-__cxa_atexit was given.
-@@ -19850,7 +19845,7 @@ else
+@@ -19873,7 +19868,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 19853 "configure"
-+#line 19848 "configure"
+-#line 19876 "configure"
++#line 19871 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -19956,7 +19951,7 @@ else
+@@ -19979,7 +19974,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 19959 "configure"
-+#line 19954 "configure"
+-#line 19982 "configure"
++#line 19977 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index de5e3aef2c8..7f8aa5329c7 100644
+index 526ce0665a3e..c15b65367419 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
 @@ -932,8 +932,6 @@ if (test $DEFAULT_MATCHPD_PARTITIONS -lt 1); then
@@ -68,5 +68,5 @@ index de5e3aef2c8..7f8aa5329c7 100644
  
  # Enable __cxa_atexit for C++.
 -- 
-2.42.0
+2.43.0
 
diff --git a/13.2.0/gentoo/88_all_Makefile.in-Make-TM_P_H-depend-on-TREE_H-PR111021.patch b/13.2.0/gentoo/88_all_Makefile.in-Make-TM_P_H-depend-on-TREE_H-PR111021.patch
index bd738cb..aa6a0f3 100644
--- a/13.2.0/gentoo/88_all_Makefile.in-Make-TM_P_H-depend-on-TREE_H-PR111021.patch
+++ b/13.2.0/gentoo/88_all_Makefile.in-Make-TM_P_H-depend-on-TREE_H-PR111021.patch
@@ -1,9 +1,9 @@
 https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=8353b9c5f5af0e65cb04fcbb7325d6a566006cd4
 
-From c60ffbdd0b7bee758672d66187b65eaf1a59d4a1 Mon Sep 17 00:00:00 2001
+From f9139ea69c23448a874cbb64c2d201cf9f7ece2f Mon Sep 17 00:00:00 2001
 From: Kewen Lin <linkw@linux.ibm.com>
 Date: Fri, 18 Aug 2023 05:03:40 -0500
-Subject: [PATCH 4/6] Makefile.in: Make TM_P_H depend on $(TREE_H) [PR111021]
+Subject: [PATCH 12/14] Makefile.in: Make TM_P_H depend on $(TREE_H) [PR111021]
 
 As PR111021 shows, the below ${port}-protos.h include tree.h
 for code_helper and tree_code:
@@ -48,7 +48,7 @@ gcc/ChangeLog:
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index 975fbb61ea8..115d2a6d9b7 100644
+index 975fbb61ea8a..115d2a6d9b76 100644
 --- a/gcc/Makefile.in
 +++ b/gcc/Makefile.in
 @@ -886,7 +886,8 @@ OPTIONS_C_EXTRA = $(PRETTY_PRINT_H)
@@ -62,5 +62,5 @@ index 975fbb61ea8..115d2a6d9b7 100644
  GTM_H     = tm.h      $(tm_file_list) insn-constants.h
  TM_H      = $(GTM_H) insn-flags.h $(OPTIONS_H)
 -- 
-2.42.0
+2.43.0
 
diff --git a/13.2.0/gentoo/89_all_Makefile.in-Make-recog.h-depend-on-TREE_H-PR111021.patch b/13.2.0/gentoo/89_all_Makefile.in-Make-recog.h-depend-on-TREE_H-PR111021.patch
index 7254215..330503a 100644
--- a/13.2.0/gentoo/89_all_Makefile.in-Make-recog.h-depend-on-TREE_H-PR111021.patch
+++ b/13.2.0/gentoo/89_all_Makefile.in-Make-recog.h-depend-on-TREE_H-PR111021.patch
@@ -1,9 +1,10 @@
 https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ecb95399f43873e1f34119ac260bbea2ef358e53
 
-From 79a97ff760ae66da49dc216260fe94d894962b1d Mon Sep 17 00:00:00 2001
+From fcf952823a3d246e6459ce7454144a96fc1f540b Mon Sep 17 00:00:00 2001
 From: Kewen Lin <linkw@linux.ibm.com>
 Date: Tue, 15 Aug 2023 03:01:20 -0500
-Subject: [PATCH 5/6] Makefile.in: Make recog.h depend on $(TREE_H) [PR111021]
+Subject: [PATCH 13/14] Makefile.in: Make recog.h depend on $(TREE_H)
+ [PR111021]
 
 Commit r14-3093 introduced a random build failure on
 build/gencondmd.cc building.  Since r14-3093 make recog.h
@@ -27,7 +28,7 @@ gcc/ChangeLog:
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index 115d2a6d9b7..2c16b14ad0f 100644
+index 115d2a6d9b76..2c16b14ad0f3 100644
 --- a/gcc/Makefile.in
 +++ b/gcc/Makefile.in
 @@ -985,7 +985,7 @@ GIMPLE_H = gimple.h gimple.def gsstruct.def $(VEC_H) \
@@ -40,5 +41,5 @@ index 115d2a6d9b7..2c16b14ad0f 100644
  FLAGS_H = flags.h flag-types.h $(OPTIONS_H)
  OPTIONS_H = options.h flag-types.h $(OPTIONS_H_EXTRA)
 -- 
-2.42.0
+2.43.0
 
diff --git a/13.2.0/gentoo/90_all_PR54179_genemit-Split-insn-emit.cc-into-ten-files.patch b/13.2.0/gentoo/90_all_PR54179_genemit-Split-insn-emit.cc-into-ten-files.patch
index 6a2f3ed..c237e7b 100644
--- a/13.2.0/gentoo/90_all_PR54179_genemit-Split-insn-emit.cc-into-ten-files.patch
+++ b/13.2.0/gentoo/90_all_PR54179_genemit-Split-insn-emit.cc-into-ten-files.patch
@@ -1,10 +1,10 @@
 https://gcc.gnu.org/PR54179
 https://inbox.sourceware.org/gcc-patches/de0f7bdc-d236-4f5b-9504-d5bfb215d023@gmail.com/
 
-From a71bcc136fee1c5a5ec6639f802daf1b22a1aab6 Mon Sep 17 00:00:00 2001
+From 366eeb9d3b5e861291be112d66940d98e9dc2693 Mon Sep 17 00:00:00 2001
 From: Robin Dapp <rdapp.gcc@gmail.com>
 Date: Fri, 27 Oct 2023 21:04:25 +0200
-Subject: [PATCH] genemit: Split insn-emit.cc into ten files.
+Subject: [PATCH 14/14] genemit: Split insn-emit.cc into ten files.
 
 After working with Sam off-list (thanks) I managed to get hppa to
 build.  Initially it looked as if hppa just had a very small number of
@@ -168,7 +168,7 @@ index 2c16b14ad0f3..b0c118e6d189 100644
  s-check : build/gencheck$(build_exeext)
  	$(RUN_GEN) build/gencheck$(build_exeext) > tmp-check.h
 diff --git a/gcc/configure b/gcc/configure
-index 3750f77fd037..056d098618b2 100755
+index 61c18a13ab7b..9a8d7ab8b8fa 100755
 --- a/gcc/configure
 +++ b/gcc/configure
 @@ -838,6 +838,7 @@ enable_gcov
@@ -187,7 +187,7 @@ index 3750f77fd037..056d098618b2 100755
  enable___cxa_atexit
  enable_decimal_float
  enable_fixed_point
-@@ -1831,6 +1833,9 @@ Optional Packages:
+@@ -1837,6 +1839,9 @@ Optional Packages:
    --with-matchpd-partitions=num
                            Set the number of partitions to make for gimple and
                            generic when splitting match.pd. [default=10]
@@ -197,7 +197,7 @@ index 3750f77fd037..056d098618b2 100755
    --with-dwarf2           force the default debug format to be DWARF 2 (or
                            later)
    --with-specs=SPECS      add SPECS to driver command-line processing
-@@ -7909,6 +7914,21 @@ fi
+@@ -7915,6 +7920,21 @@ fi
  
  
  
@@ -219,26 +219,26 @@ index 3750f77fd037..056d098618b2 100755
  # Enable __cxa_atexit for C++.
  # Check whether --enable-__cxa_atexit was given.
  if test "${enable___cxa_atexit+set}" = set; then :
-@@ -19845,7 +19865,7 @@ else
+@@ -19868,7 +19888,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 19848 "configure"
-+#line 19995 "configure"
+-#line 19871 "configure"
++#line 19891 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -19951,7 +19971,7 @@ else
+@@ -19974,7 +19994,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 19954 "configure"
-+#line 20101 "configure"
+-#line 19977 "configure"
++#line 19997 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
 diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 7f8aa5329c7f..efbaa0bf6eeb 100644
+index c15b65367419..66b9eaa99e08 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
 @@ -934,6 +934,19 @@ fi
@@ -1400,5 +1400,5 @@ index b309c9c3deb6..2adcb58478fe 100644
    struct enum_type *lookup_enum_type (const char *name);
    void traverse_enum_types (htab_trav callback, void *info);
 -- 
-2.42.0
+2.43.0
 
diff --git a/13.2.0/gentoo/README.history b/13.2.0/gentoo/README.history
index 0e54b6b..e306264 100644
--- a/13.2.0/gentoo/README.history
+++ b/13.2.0/gentoo/README.history
@@ -6,6 +6,10 @@
 	U 79_all_genmatch-split-shared-code-to-gimple-match-exports.c.patch
 	U 80_all_match.pd-automatically-partition-match.cc-files.patch
 	U 81_all_match.pd-Use-splits-in-makefile-and-make-configurabl.patch
+	U 87_all_Remove-DEFAULT_MATCHPD_PARTITIONS-macro.patch
+	U 88_all_Makefile.in-Make-TM_P_H-depend-on-TREE_H-PR111021.patch
+	U 89_all_Makefile.in-Make-recog.h-depend-on-TREE_H-PR111021.patch
+	U 90_all_PR54179_genemit-Split-insn-emit.cc-into-ten-files.patch
 	+ 82_all_Makefile.in-clean-up-match.pd-related-dependencies.patch
 
 10	28 Oct 2023