GCC 13: add recent fixes to haikuports build (#9222)

This pulls in: * [0bb5624b57] libgcc: fix config for arm64 * [f7a513f636] GCC: set the '-rdynamic' command line option to ignore
haikuports · Aug 15, 2023 · 46afdec · 46afdec
1 parent 68e4912
commit 46afdec
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/sys-devel/gcc/gcc-13.2.0_2023_08_10.recipe b/sys-devel/gcc/gcc-13.2.0_2023_08_10.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="https://gcc.gnu.org/"
 COPYRIGHT="1988-2023 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
-REVISION="1"
+REVISION="2"
 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"

diff --git a/sys-devel/gcc/patches/gcc-13.2.0_2023_08_10.patchset b/sys-devel/gcc/patches/gcc-13.2.0_2023_08_10.patchset
@@ -1,6 +1,6 @@
-From 4c89b0d1cb681d28c4dbda68d4d1f7aaeea4131c Mon Sep 17 00:00:00 2001
+From 7c8661ad7e72f2ac5e4d7e75f70b833eb1a93254 Mon Sep 17 00:00:00 2001
 From: Niels Sascha Reedijk <niels.reedijk@gmail.com>
-Date: Fri, 11 Aug 2023 01:13:04 +0100
+Date: Tue, 15 Aug 2023 06:19:59 +0100
 Subject: [PATCH] Modifications for GCC 13.2.0 for Haiku (from buildtools
  repository)
 
@@ -43,7 +43,7 @@ Subject: [PATCH] Modifications for GCC 13.2.0 for Haiku (from buildtools
  libatomic/configure.ac                        |   24 +-
  libatomic/configure.tgt                       |    2 +-
  libcody/configure                             |    2 +-
- libgcc/config.host                            |   35 +-
+ libgcc/config.host                            |   37 +-
  libgcc/config/aarch64/haiku-unwind.h          |   51 +
  libgcc/config/t-haiku                         |    3 +
  libgcc/crtstuff.c                             |    2 +
@@ -59,7 +59,7 @@ Subject: [PATCH] Modifications for GCC 13.2.0 for Haiku (from buildtools
  libstdc++-v3/crossconfig.m4                   |   44 +-
  libstdc++-v3/libsupc++/tinfo.cc               |    9 +
  libtool.m4                                    |   11 +-
- 54 files changed, 3754 insertions(+), 1464 deletions(-)
+ 54 files changed, 3756 insertions(+), 1464 deletions(-)
  create mode 100644 gcc/config/aarch64/aarch64-haiku.h
  create mode 100644 gcc/config/aarch64/t-aarch64-haiku
  create mode 100644 gcc/config/arm/haiku.h
@@ -5524,7 +5524,7 @@ index 000000000..88adc2577
 +#define USE_TM_CLONE_REGISTRY 0
 diff --git a/gcc/config/haiku.opt b/gcc/config/haiku.opt
 new file mode 100644
-index 000000000..5b22f3b44
+index 000000000..6a44a4125
 --- /dev/null
 +++ b/gcc/config/haiku.opt
 @@ -0,0 +1,32 @@
@@ -5557,7 +5557,7 @@ index 000000000..5b22f3b44
 +Driver
 +
 +rdynamic
-+Driver
++Ignore
 +
 +; This comment is to ensure we retain the blank line above.
 diff --git a/gcc/config/i386/haiku.h b/gcc/config/i386/haiku.h
@@ -7056,7 +7056,7 @@ index da52a5cfc..d92e55a09 100755
  #endif
 
 diff --git a/libgcc/config.host b/libgcc/config.host
-index 9d7212028..de19ece39 100644
+index 9d7212028..662bc116e 100644
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
 @@ -103,7 +103,7 @@ arm*-*-*)
@@ -7083,19 +7083,21 @@ index 9d7212028..de19ece39 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"
-@@ -416,6 +424,11 @@ aarch64*-*-fuchsia*)
+@@ -416,6 +424,13 @@ aarch64*-*-fuchsia*)
  	tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp"
  	tmake_file="${tmake_file} t-dfprules"
  	;;
 +aarch64*-*-haiku*)
 +	tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
++	tmake_file="${tmake_file} ${cpu_type}/t-lse t-slibgcc-libgcc"
 +	tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp"
++	tmake_file="${tmake_file} t-dfprules"
 +	md_unwind_header=aarch64/haiku-unwind.h
 +	;;
  aarch64*-*-linux*)
  	extra_parts="$extra_parts crtfastmath.o"
  	md_unwind_header=aarch64/linux-unwind.h
-@@ -504,6 +517,12 @@ arm*-*-netbsdelf*)
+@@ -504,6 +519,12 @@ arm*-*-netbsdelf*)
  	    ;;
  	esac
  	;;
@@ -7108,7 +7110,7 @@ index 9d7212028..de19ece39 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"
-@@ -731,6 +750,12 @@ x86_64-*-freebsd*)
+@@ -731,6 +752,12 @@ x86_64-*-freebsd*)
  	tmake_file="${tmake_file} i386/t-freebsd i386/t-crtstuff"
  	md_unwind_header=i386/freebsd-unwind.h
  	;;
@@ -7121,7 +7123,7 @@ index 9d7212028..de19ece39 100644
  i[34567]86-*-netbsdelf*)
  	tmake_file="${tmake_file} i386/t-crtstuff"
  	;;
-@@ -961,6 +986,8 @@ m32r-*-elf*)
+@@ -961,6 +988,8 @@ m32r-*-elf*)
  m32rle-*-elf*)
  	tmake_file=t-fdpbit
  	;;
@@ -7130,7 +7132,7 @@ index 9d7212028..de19ece39 100644
  m68k-*-elf* | fido-*-elf)
  	tmake_file="$tmake_file m68k/t-floatlib"
  	;;
-@@ -1031,6 +1058,8 @@ mips*-sde-elf*)
+@@ -1031,6 +1060,8 @@ mips*-sde-elf*)
  	esac
  	extra_parts="$extra_parts crti.o crtn.o"
  	;;
@@ -7139,7 +7141,7 @@ index 9d7212028..de19ece39 100644
  mipsisa32-*-elf* | mipsisa32el-*-elf* | \
  mipsisa32r2-*-elf* | mipsisa32r2el-*-elf* | \
  mipsisa32r6-*-elf* | mipsisa32r6el-*-elf* | \
-@@ -1189,6 +1218,8 @@ powerpc*-*-freebsd*)
+@@ -1189,6 +1220,8 @@ powerpc*-*-freebsd*)
  	  ;;
  	esac
  	;;
@@ -7148,7 +7150,7 @@ index 9d7212028..de19ece39 100644
  powerpc-*-netbsd*)
  	tmake_file="$tmake_file rs6000/t-netbsd rs6000/t-crtstuff"
  	;;
-@@ -1467,6 +1498,8 @@ sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
+@@ -1467,6 +1500,8 @@ sparc64-*-linux*)		# 64-bit SPARC's running GNU/Linux
  	fi
  	md_unwind_header=sparc/linux-unwind.h
  	;;