From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 20 May 2025 07:36:58 +0000 (+0200)
Subject: libgcc: Move bitint support exports to x86/aarch64 specific map files
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35fd4abd3b9631e24f8b0b910edb001561eaa382;p=thirdparty%2Fgcc.git

libgcc: Move bitint support exports to x86/aarch64 specific map files

When adding _BitInt support I was hoping all or most of arches would
implement it already for GCC 14.  That didn't happen and with
new hosts adding support for _BitInt for GCC 16 (s390x-linux and as was
posted today loongarch-linux too), we need the _BitInt support functions
exported on those arches at GCC_16.0.0 rather than GCC_14.0.0 which
shouldn't be changed anymore.

The following patch does that.  Both arches were already exporting
some of the _BitInt related symbols in their specific map files, this
just moves the remaining ones there as well.

2025-05-20  Jakub Jelinek  <jakub@redhat.com>

	* libgcc-std.ver.in (GCC_14.0.0): Remove bitint related exports
	from here.
	* config/i386/libgcc-glibc.ver (GCC_14.0.0): Add them here.
	* config/i386/libgcc-darwin.ver (GCC_14.0.0): Likewise.
	* config/i386/libgcc-sol2.ver (GCC_14.0.0): Likewise.
	* config/aarch64/libgcc-softfp.ver (GCC_14.0.0): Likewise.
---

diff --git a/libgcc/config/aarch64/libgcc-softfp.ver b/libgcc/config/aarch64/libgcc-softfp.ver
index c24466c1fef..3b392c98581 100644
--- a/libgcc/config/aarch64/libgcc-softfp.ver
+++ b/libgcc/config/aarch64/libgcc-softfp.ver
@@ -42,8 +42,14 @@ GCC_13.0.0 {
 
 %inherit GCC_14.0.0 GCC_13.0.0
 GCC_14.0.0 {
+  __mulbitint3
+  __divmodbitint4
+  __fixsfbitint
+  __fixdfbitint
   __fixtfbitint
   __floatbitintbf
   __floatbitinthf
+  __floatbitintsf
+  __floatbitintdf
   __floatbitinttf
 }
diff --git a/libgcc/config/i386/libgcc-darwin.ver b/libgcc/config/i386/libgcc-darwin.ver
index 06560d6b47f..fd609eaaaf6 100644
--- a/libgcc/config/i386/libgcc-darwin.ver
+++ b/libgcc/config/i386/libgcc-darwin.ver
@@ -37,10 +37,16 @@ GCC_14.0.0 {
   __truncxfbf2
   __trunchfbf2
   # Added to GCC_14.0.0 in i386/libgcc-glibc.ver.
+  __mulbitint3
+  __divmodbitint4
+  __fixsfbitint
+  __fixdfbitint
   __fixxfbitint
   __fixtfbitint
   __floatbitintbf
   __floatbitinthf
+  __floatbitintsf
+  __floatbitintdf
   __floatbitintxf
   __floatbitinttf
 }
diff --git a/libgcc/config/i386/libgcc-glibc.ver b/libgcc/config/i386/libgcc-glibc.ver
index e71cc225049..9e47b9a73fe 100644
--- a/libgcc/config/i386/libgcc-glibc.ver
+++ b/libgcc/config/i386/libgcc-glibc.ver
@@ -229,10 +229,16 @@ GCC_13.0.0 {
 
 %inherit GCC_14.0.0 GCC_13.0.0
 GCC_14.0.0 {
+  __mulbitint3
+  __divmodbitint4
+  __fixsfbitint
+  __fixdfbitint
   __fixxfbitint
   __fixtfbitint
   __floatbitintbf
   __floatbitinthf
+  __floatbitintsf
+  __floatbitintdf
   __floatbitintxf
   __floatbitinttf
 }
diff --git a/libgcc/config/i386/libgcc-sol2.ver b/libgcc/config/i386/libgcc-sol2.ver
index d2d626531c2..538bb69a2c9 100644
--- a/libgcc/config/i386/libgcc-sol2.ver
+++ b/libgcc/config/i386/libgcc-sol2.ver
@@ -144,10 +144,16 @@ GCC_14.0.0 {
   __truncxfbf2
   __trunchfbf2
   # Added to GCC_14.0.0 in i386/libgcc-glibc.ver.
+  __mulbitint3
+  __divmodbitint4
+  __fixsfbitint
+  __fixdfbitint
   __fixxfbitint
   __fixtfbitint
   __floatbitintbf
   __floatbitinthf
+  __floatbitintsf
+  __floatbitintdf
   __floatbitintxf
   __floatbitinttf
 }
diff --git a/libgcc/libgcc-std.ver.in b/libgcc/libgcc-std.ver.in
index 1e372d74f0f..3b3b5e6302e 100644
--- a/libgcc/libgcc-std.ver.in
+++ b/libgcc/libgcc-std.ver.in
@@ -1947,12 +1947,6 @@ GCC_7.0.0 {
 
 %inherit GCC_14.0.0 GCC_7.0.0
 GCC_14.0.0 {
-  __PFX__mulbitint3
-  __PFX__divmodbitint4
-  __PFX__fixsfbitint
-  __PFX__fixdfbitint
-  __PFX__floatbitintsf
-  __PFX__floatbitintdf
   __PFX__hardcfr_check
   __PFX__strub_enter
   __PFX__strub_update