From 0201bae0d143fb85dc77ec34b65e7c7f024c5da7 Mon Sep 17 00:00:00 2001
From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
Date: Sat, 12 Aug 2023 08:04:13 +0100
Subject: [PATCH] GCC: bump to 13.2.0 (#9174)

---
 ...20.recipe => gcc-13.2.0_2023_08_10.recipe} |  4 +-
 ...atchset => gcc-13.2.0_2023_08_10.patchset} | 68 +++++++++----------
 2 files changed, 36 insertions(+), 36 deletions(-)
 rename sys-devel/gcc/{gcc-13.1.0_2023_06_20.recipe => gcc-13.2.0_2023_08_10.recipe} (99%)
 rename sys-devel/gcc/patches/{gcc-13.1.0_2023_06_20.patchset => gcc-13.2.0_2023_08_10.patchset} (99%)

diff --git a/sys-devel/gcc/gcc-13.1.0_2023_06_20.recipe b/sys-devel/gcc/gcc-13.2.0_2023_08_10.recipe
similarity index 99%
rename from sys-devel/gcc/gcc-13.1.0_2023_06_20.recipe
rename to sys-devel/gcc/gcc-13.2.0_2023_08_10.recipe
index 7fbe502f0..0633356bb 100644
--- a/sys-devel/gcc/gcc-13.1.0_2023_06_20.recipe
+++ b/sys-devel/gcc/gcc-13.2.0_2023_08_10.recipe
@@ -9,7 +9,7 @@ REVISION="1"
 gccVersion="${portVersion%%_*}"
 SOURCE_URI="https://ftpmirror.gnu.org/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz
 	https://ftp.gnu.org/gnu/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz"
-CHECKSUM_SHA256="61d684f0aa5e76ac6585ad8898a2427aade8979ed5e7f85492286c4dfc13ee86"
+CHECKSUM_SHA256="e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da"
 SOURCE_DIR="gcc-$gccVersion"
 PATCHES="gcc-$portVersion.patchset"
 
@@ -38,7 +38,7 @@ libsspSoVersion="0"
 libsspLibVersion="0.0.0"
 
 libstdcxxSoVersion="6"
-libstdcxxLibVersion="6.0.31"
+libstdcxxLibVersion="6.0.32"
 
 PROVIDES="
 	gcc$secondaryArchSuffix = $portVersion compat >= 7
diff --git a/sys-devel/gcc/patches/gcc-13.1.0_2023_06_20.patchset b/sys-devel/gcc/patches/gcc-13.2.0_2023_08_10.patchset
similarity index 99%
rename from sys-devel/gcc/patches/gcc-13.1.0_2023_06_20.patchset
rename to sys-devel/gcc/patches/gcc-13.2.0_2023_08_10.patchset
index dca50262f..4cd5f45c1 100644
--- a/sys-devel/gcc/patches/gcc-13.1.0_2023_06_20.patchset
+++ b/sys-devel/gcc/patches/gcc-13.2.0_2023_08_10.patchset
@@ -1,7 +1,7 @@
-From 046145fe2778c5b29a7dcf1fe49184b56ec561b5 Mon Sep 17 00:00:00 2001
+From 4c89b0d1cb681d28c4dbda68d4d1f7aaeea4131c Mon Sep 17 00:00:00 2001
 From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
-Date: Tue, 20 Jun 2023 16:14:19 +0100
-Subject: [PATCH] Modifications for GCC 13.1.0 for Haiku (from buildtools
+Date: Fri, 11 Aug 2023 01:13:04 +0100
+Subject: [PATCH] Modifications for GCC 13.2.0 for Haiku (from buildtools
  repository)
 
 ---
@@ -4703,7 +4703,7 @@ index b3e9bbd2a..362fd8159 100644
      # Remove unsupported stuff on all kaOS configurations.
      noconfigdirs="$noconfigdirs target-libgloss"
 diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index ad9a5d94c..bcbafbb2a 100644
+index 775aaa1b3..40f9bc2dd 100644
 --- a/gcc/Makefile.in
 +++ b/gcc/Makefile.in
 @@ -106,6 +106,8 @@ build_objdir := $(toplevel_builddir)/$(build_subdir)
@@ -4756,7 +4756,7 @@ index ad9a5d94c..bcbafbb2a 100644
  cppbuiltin.o: $(BASEVER)
  
 diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 6fd159448..ca188fa72 100644
+index 648b3dc21..4bf2366c7 100644
 --- a/gcc/config.gcc
 +++ b/gcc/config.gcc
 @@ -181,7 +181,7 @@
@@ -4797,7 +4797,7 @@ index 6fd159448..ca188fa72 100644
  	;;
 +aarch64*-*-haiku*)
 +	gcc_cv_initfini_array=yes
-+	tm_file="${tm_file} dbxelf.h elfos.h haiku.h haiku-stdint.h"
++	tm_file="${tm_file} elfos.h haiku.h haiku-stdint.h"
 +	tm_file="${tm_file} aarch64/aarch64-elf.h aarch64/aarch64-haiku.h"
 +	tmake_file="${tmake_file} t-haiku aarch64/t-aarch64 aarch64/t-aarch64-haiku"
 +	;;
@@ -4810,7 +4810,7 @@ index 6fd159448..ca188fa72 100644
  	;;
 +arm*-*-haiku*)
 +	tmake_file="${tmake_file} t-haiku arm/t-arm arm/t-arm-elf arm/t-bpabi arm/t-haiku"
-+	tm_file="dbxelf.h elfos.h haiku.h arm/elf.h arm/bpabi.h arm/haiku.h haiku-stdint.h"
++	tm_file="elfos.h haiku.h arm/elf.h arm/bpabi.h arm/haiku.h haiku-stdint.h"
 +	# The BPABI long long divmod functions return a 128-bit value in
 +	# registers r0-r3.  Correctly modeling that requires the use of
 +	# TImode.
@@ -4844,7 +4844,7 @@ index 6fd159448..ca188fa72 100644
 +	default_m68k_cpu=68020
 +	default_cf_cpu=5206
 +	tmake_file="${tmake_file} m68k/t-m68kbare m68k/t-crtstuff t-haiku" #??
-+	tm_file="${tm_file} dbxelf.h elfos.h haiku.h m68k/haiku.h haiku-stdint.h"
++	tm_file="${tm_file} elfos.h haiku.h m68k/haiku.h haiku-stdint.h"
 +	tm_defines="${tm_defines} MOTOROLA=1"
 +	;;
  mcore-*-elf)
@@ -4882,7 +4882,7 @@ index 6fd159448..ca188fa72 100644
  	;;
 +powerpc-*-haiku*)
 +	tmake_file="${tmake_file} rs6000/t-fprules rs6000/t-ppcos rs6000/t-ppccomm t-haiku"
-+	tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h rs6000/sysv4.h haiku.h rs6000/haiku.h haiku-stdint.h"
++	tm_file="${tm_file} elfos.h freebsd-spec.h rs6000/sysv4.h haiku.h rs6000/haiku.h haiku-stdint.h"
 +	extra_options="${extra_options} rs6000/sysv4.opt"
 +	;;
  powerpc-*-rtems*)
@@ -4893,7 +4893,7 @@ index 6fd159448..ca188fa72 100644
  	tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems-64"
  	;;
 +sparc64-*-haiku*)
-+	tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp64-elf.h haiku.h sparc/haiku.h haiku-stdint.h"
++	tm_file="${tm_file} elfos.h sparc/sysv4.h sparc/sp64-elf.h haiku.h sparc/haiku.h haiku-stdint.h"
 +	extra_options="${extra_options}"
 +	tmake_file="${tmake_file} t-haiku sparc/t-sparc sparc/t-haiku"
 +	;;
@@ -7056,7 +7056,7 @@ index da52a5cfc..d92e55a09 100755
  #endif
  
 diff --git a/libgcc/config.host b/libgcc/config.host
-index b9975de90..ac7894e90 100644
+index 9d7212028..de19ece39 100644
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
 @@ -103,7 +103,7 @@ arm*-*-*)
@@ -7068,7 +7068,7 @@ index b9975de90..ac7894e90 100644
  bfin*-*)
  	cpu_type=bfin
  	;;
-@@ -263,6 +263,14 @@ case ${host} in
+@@ -281,6 +281,14 @@ case ${host} in
    tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-fuchsia"
    extra_parts="crtbegin.o crtend.o"
    ;;
@@ -7083,7 +7083,7 @@ index b9975de90..ac7894e90 100644
  *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu | *-*-uclinuxfdpiceabi)
    tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
    extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-@@ -398,6 +406,11 @@ aarch64*-*-fuchsia*)
+@@ -416,6 +424,11 @@ aarch64*-*-fuchsia*)
  	tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp"
  	tmake_file="${tmake_file} t-dfprules"
  	;;
@@ -7095,7 +7095,7 @@ index b9975de90..ac7894e90 100644
  aarch64*-*-linux*)
  	extra_parts="$extra_parts crtfastmath.o"
  	md_unwind_header=aarch64/linux-unwind.h
-@@ -486,6 +499,12 @@ arm*-*-netbsdelf*)
+@@ -504,6 +517,12 @@ arm*-*-netbsdelf*)
  	    ;;
  	esac
  	;;
@@ -7108,7 +7108,7 @@ index b9975de90..ac7894e90 100644
  arm*-*-linux* | arm*-*-uclinuxfdpiceabi)
  	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix t-crtfm"
  	tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
-@@ -713,6 +732,12 @@ x86_64-*-freebsd*)
+@@ -731,6 +750,12 @@ x86_64-*-freebsd*)
  	tmake_file="${tmake_file} i386/t-freebsd i386/t-crtstuff"
  	md_unwind_header=i386/freebsd-unwind.h
  	;;
@@ -7121,7 +7121,7 @@ index b9975de90..ac7894e90 100644
  i[34567]86-*-netbsdelf*)
  	tmake_file="${tmake_file} i386/t-crtstuff"
  	;;
-@@ -943,6 +968,8 @@ m32r-*-elf*)
+@@ -961,6 +986,8 @@ m32r-*-elf*)
  m32rle-*-elf*)
  	tmake_file=t-fdpbit
  	;;
@@ -7130,7 +7130,7 @@ index b9975de90..ac7894e90 100644
  m68k-*-elf* | fido-*-elf)
  	tmake_file="$tmake_file m68k/t-floatlib"
  	;;
-@@ -1013,6 +1040,8 @@ mips*-sde-elf*)
+@@ -1031,6 +1058,8 @@ mips*-sde-elf*)
  	esac
  	extra_parts="$extra_parts crti.o crtn.o"
  	;;
@@ -7139,7 +7139,7 @@ index b9975de90..ac7894e90 100644
  mipsisa32-*-elf* | mipsisa32el-*-elf* | \
  mipsisa32r2-*-elf* | mipsisa32r2el-*-elf* | \
  mipsisa32r6-*-elf* | mipsisa32r6el-*-elf* | \
-@@ -1171,6 +1200,8 @@ powerpc*-*-freebsd*)
+@@ -1189,6 +1218,8 @@ powerpc*-*-freebsd*)
  	  ;;
  	esac
  	;;
@@ -7148,7 +7148,7 @@ index b9975de90..ac7894e90 100644
  powerpc-*-netbsd*)
  	tmake_file="$tmake_file rs6000/t-netbsd rs6000/t-crtstuff"
  	;;
-@@ -1449,6 +1480,8 @@ sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
+@@ -1467,6 +1498,8 @@ sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
  	fi
  	md_unwind_header=sparc/linux-unwind.h
  	;;
@@ -7238,10 +7238,10 @@ index 93ff5b81d..959f45e7f 100644
     But it doesn't use PT_GNU_EH_FRAME ELF segment currently.  */
  # if !defined(__UCLIBC__) \
 diff --git a/libgomp/configure b/libgomp/configure
-index fd0e337b5..898722b00 100755
+index ed18809ff..dc4dd7683 100755
 --- a/libgomp/configure
 +++ b/libgomp/configure
-@@ -8495,8 +8495,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8496,8 +8496,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
      haiku*)
        # PIC is the default for Haiku.
@@ -7250,7 +7250,7 @@ index fd0e337b5..898722b00 100755
        ;;
  
      hpux*)
-@@ -10598,8 +10596,9 @@ haiku*)
+@@ -10599,8 +10597,9 @@ haiku*)
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -7262,7 +7262,7 @@ index fd0e337b5..898722b00 100755
    ;;
  
  hpux9* | hpux10* | hpux11*)
-@@ -11140,7 +11139,7 @@ else
+@@ -11141,7 +11140,7 @@ else
    lt_cv_dlopen_libs=
  
    case $host_os in
@@ -7271,7 +7271,7 @@ index fd0e337b5..898722b00 100755
      lt_cv_dlopen="load_add_on"
      lt_cv_dlopen_libs=
      lt_cv_dlopen_self=yes
-@@ -12389,8 +12388,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -12390,8 +12389,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
      haiku*)
        # PIC is the default for Haiku.
@@ -7280,7 +7280,7 @@ index fd0e337b5..898722b00 100755
        ;;
  
      hpux*)
-@@ -14257,8 +14254,9 @@ haiku*)
+@@ -14258,8 +14255,9 @@ haiku*)
    soname_spec='${libname}${release}${shared_ext}$major'
    shlibpath_var=LIBRARY_PATH
    shlibpath_overrides_runpath=yes
@@ -7292,7 +7292,7 @@ index fd0e337b5..898722b00 100755
    ;;
  
  hpux9* | hpux10* | hpux11*)
-@@ -14958,7 +14956,6 @@ case "$host" in
+@@ -14959,7 +14957,6 @@ case "$host" in
    *)
      # Check to see if -pthread or -lpthread is needed.  Prefer the former.
      # In case the pthread.h system header is not found, this test will fail.
@@ -7300,7 +7300,7 @@ index fd0e337b5..898722b00 100755
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <pthread.h>
-@@ -14972,9 +14969,9 @@ pthread_t t; pthread_create(&t,NULL,g,NULL);
+@@ -14973,9 +14970,9 @@ pthread_t t; pthread_create(&t,NULL,g,NULL);
  }
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
@@ -7312,7 +7312,7 @@ index fd0e337b5..898722b00 100755
        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #include <pthread.h>
-@@ -14987,6 +14984,22 @@ pthread_t t; pthread_create(&t,NULL,g,NULL);
+@@ -14988,6 +14985,22 @@ pthread_t t; pthread_create(&t,NULL,g,NULL);
    return 0;
  }
  _ACEOF
@@ -7335,7 +7335,7 @@ index fd0e337b5..898722b00 100755
  if ac_fn_c_try_link "$LINENO"; then :
  
  else
-@@ -14995,6 +15008,9 @@ fi
+@@ -14996,6 +15009,9 @@ fi
  rm -f core conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
  fi
@@ -7346,7 +7346,7 @@ index fd0e337b5..898722b00 100755
      conftest$ac_exeext conftest.$ac_ext
  esac
 diff --git a/libgomp/configure.ac b/libgomp/configure.ac
-index a9b1f3973..5fbf57125 100644
+index cc96e5b75..4ec9a320b 100644
 --- a/libgomp/configure.ac
 +++ b/libgomp/configure.ac
 @@ -197,21 +197,27 @@ case "$host" in
@@ -7972,7 +7972,7 @@ index 000000000..02c869321
 +
 +#endif
 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index 68ee94c9e..56fb82c40 100755
+index 9b6027775..ecd533729 100755
 --- a/libstdc++-v3/configure
 +++ b/libstdc++-v3/configure
 @@ -9237,8 +9237,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
@@ -8026,7 +8026,7 @@ index 68ee94c9e..56fb82c40 100755
    ;;
  
  hpux9* | hpux10* | hpux11*)
-@@ -47552,6 +47550,89 @@ done
+@@ -47618,6 +47616,89 @@ done
  
      ;;
  
@@ -8117,7 +8117,7 @@ index 68ee94c9e..56fb82c40 100755
      SECTION_FLAGS='-ffunction-sections -fdata-sections'
  
 diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
-index ec32980aa..8dbe77c66 100644
+index 9e7c7f02d..d9f15fb0a 100644
 --- a/libstdc++-v3/configure.host
 +++ b/libstdc++-v3/configure.host
 @@ -267,6 +267,9 @@ case "${host_os}" in
@@ -8130,7 +8130,7 @@ index ec32980aa..8dbe77c66 100644
    hpux*)
      os_include_dir="os/hpux"
      ;;
-@@ -354,7 +357,7 @@ case "${host}" in
+@@ -357,7 +360,7 @@ case "${host}" in
  	;;
      esac
      ;;