libgcc: Fix __builtin_nested_func_ptr_{created,deleted} symbol versions [PR113402]

Message ID ZaY8/lXoOQ82jN//@tucnak
State New
Headers
Series libgcc: Fix __builtin_nested_func_ptr_{created,deleted} symbol versions [PR113402] |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 fail Patch failed to apply

Commit Message

Jakub Jelinek Jan. 16, 2024, 8:23 a.m. UTC
  Hi!

These symbols were exported at an incorrect symbol version,
the following patch fixes that.

I believe we should also rename the symbols (__nested_func_ptr_*
or __gcc_nested_func_ptr_* or similar), __builtin_ in the name
doesn't look right, but that will need more changes to make it
work.

Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?

2024-01-16  Jakub Jelinek  <jakub@redhat.com>

	PR libgcc/113402
	* libgcc-std.ver.in (GCC_7.0.0): Move
	__builtin_nested_func_ptr_created and
	__builtin_nested_func_ptr_deleted from this symbol version to ...
	(GCC_14.0.0): ... this one.


	Jakub
  

Comments

Richard Biener Jan. 16, 2024, 8:45 a.m. UTC | #1
On Tue, 16 Jan 2024, Jakub Jelinek wrote:

> Hi!
> 
> These symbols were exported at an incorrect symbol version,
> the following patch fixes that.
> 
> I believe we should also rename the symbols (__nested_func_ptr_*
> or __gcc_nested_func_ptr_* or similar), __builtin_ in the name
> doesn't look right, but that will need more changes to make it
> work.
> 
> Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?

OK, but maybe squash with the renaming.

> 2024-01-16  Jakub Jelinek  <jakub@redhat.com>
> 
> 	PR libgcc/113402
> 	* libgcc-std.ver.in (GCC_7.0.0): Move
> 	__builtin_nested_func_ptr_created and
> 	__builtin_nested_func_ptr_deleted from this symbol version to ...
> 	(GCC_14.0.0): ... this one.
> 
> --- libgcc/libgcc-std.ver.in.jj	2024-01-03 12:07:29.751347757 +0100
> +++ libgcc/libgcc-std.ver.in	2024-01-15 17:55:16.064728452 +0100
> @@ -1943,9 +1943,6 @@ GCC_4.8.0 {
>  GCC_7.0.0 {
>    __PFX__divmoddi4
>    __PFX__divmodti4
> -
> -  __builtin_nested_func_ptr_created
> -  __builtin_nested_func_ptr_deleted
>  }
>  
>  %inherit GCC_14.0.0 GCC_7.0.0
> @@ -1960,4 +1957,6 @@ GCC_14.0.0 {
>    __PFX__strub_enter
>    __PFX__strub_update
>    __PFX__strub_leave
> +  __builtin_nested_func_ptr_created
> +  __builtin_nested_func_ptr_deleted
>  }
> 
> 	Jakub
> 
>
  

Patch

--- libgcc/libgcc-std.ver.in.jj	2024-01-03 12:07:29.751347757 +0100
+++ libgcc/libgcc-std.ver.in	2024-01-15 17:55:16.064728452 +0100
@@ -1943,9 +1943,6 @@  GCC_4.8.0 {
 GCC_7.0.0 {
   __PFX__divmoddi4
   __PFX__divmodti4
-
-  __builtin_nested_func_ptr_created
-  __builtin_nested_func_ptr_deleted
 }
 
 %inherit GCC_14.0.0 GCC_7.0.0
@@ -1960,4 +1957,6 @@  GCC_14.0.0 {
   __PFX__strub_enter
   __PFX__strub_update
   __PFX__strub_leave
+  __builtin_nested_func_ptr_created
+  __builtin_nested_func_ptr_deleted
 }