diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2024-01-16 10:21:14 +0000 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2024-01-28 10:59:34 +0000 |
| commit | 837827f8f2542c36ba5944b4da0a76ea6a64b08b (patch) | |
| tree | ac406b504717cf847f7f5543febf30eac96bd885 /gcc/tree.cc | |
| parent | 557bea3d2e13bd8a4a19f494df748f7a384dc649 (diff) | |
| download | gcc-837827f8f2542c36ba5944b4da0a76ea6a64b08b.zip gcc-837827f8f2542c36ba5944b4da0a76ea6a64b08b.tar.gz gcc-837827f8f2542c36ba5944b4da0a76ea6a64b08b.tar.bz2 | |
Fix __builtin_nested_func_ptr_{created,deleted} symbol versions [PR113402]
The symbols for the functions supporting heap-based trampolines were
exported at an incorrect symbol version, the following patch fixes that.
As requested in the PR, this also renames __builtin_nested_func_ptr* to
__gcc_nested_func_ptr*. In carrying our the rename, we move the builtins
to use DEF_EXT_LIB_BUILTIN.
PR libgcc/113402
gcc/ChangeLog:
* builtins.cc (expand_builtin): Handle BUILT_IN_GCC_NESTED_PTR_CREATED
and BUILT_IN_GCC_NESTED_PTR_DELETED.
* builtins.def (BUILT_IN_GCC_NESTED_PTR_CREATED,
BUILT_IN_GCC_NESTED_PTR_DELETED): Make these builtins LIB-EXT and
rename the library fallbacks to __gcc_nested_func_ptr_created and
__gcc_nested_func_ptr_deleted.
* doc/invoke.texi: Rename these to __gcc_nested_func_ptr_created
and __gcc_nested_func_ptr_deleted.
* tree-nested.cc (finalize_nesting_tree_1): Use builtin_explicit for
BUILT_IN_GCC_NESTED_PTR_CREATED and BUILT_IN_GCC_NESTED_PTR_DELETED.
* tree.cc (build_common_builtin_nodes): Build the
BUILT_IN_GCC_NESTED_PTR_CREATED and BUILT_IN_GCC_NESTED_PTR_DELETED local
builtins only for non-explicit.
libgcc/ChangeLog:
* config/aarch64/heap-trampoline.c: Rename
__builtin_nested_func_ptr_created to __gcc_nested_func_ptr_created and
__builtin_nested_func_ptr_deleted to __gcc_nested_func_ptr_deleted.
* config/i386/heap-trampoline.c: Likewise.
* libgcc2.h: Likewise.
* libgcc-std.ver.in (GCC_7.0.0): Likewise and then move
__gcc_nested_func_ptr_created and
__gcc_nested_func_ptr_deleted from this symbol version to ...
(GCC_14.0.0): ... this one.
Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
Co-authored-by: Jakub Jelinek <jakub@redhat.com>
Diffstat (limited to 'gcc/tree.cc')
| -rw-r--r-- | gcc/tree.cc | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/gcc/tree.cc b/gcc/tree.cc index 8aee3ef..3dff8c5 100644 --- a/gcc/tree.cc +++ b/gcc/tree.cc @@ -9929,20 +9929,25 @@ build_common_builtin_nodes (void) tree ptr_ptr_type_node = build_pointer_type (ptr_type_node); - ftype = build_function_type_list (void_type_node, - ptr_type_node, // void *chain - ptr_type_node, // void *func - ptr_ptr_type_node, // void **dst - NULL_TREE); - local_define_builtin ("__builtin_nested_func_ptr_created", ftype, - BUILT_IN_NESTED_PTR_CREATED, - "__builtin_nested_func_ptr_created", ECF_NOTHROW); + if (!builtin_decl_explicit_p (BUILT_IN_GCC_NESTED_PTR_CREATED)) + { + ftype = build_function_type_list (void_type_node, + ptr_type_node, // void *chain + ptr_type_node, // void *func + ptr_ptr_type_node, // void **dst + NULL_TREE); + local_define_builtin ("__builtin___gcc_nested_func_ptr_created", ftype, + BUILT_IN_GCC_NESTED_PTR_CREATED, + "__gcc_nested_func_ptr_created", ECF_NOTHROW); + } - ftype = build_function_type_list (void_type_node, - NULL_TREE); - local_define_builtin ("__builtin_nested_func_ptr_deleted", ftype, - BUILT_IN_NESTED_PTR_DELETED, - "__builtin_nested_func_ptr_deleted", ECF_NOTHROW); + if (!builtin_decl_explicit_p (BUILT_IN_GCC_NESTED_PTR_DELETED)) + { + ftype = build_function_type_list (void_type_node, NULL_TREE); + local_define_builtin ("__builtin___gcc_nested_func_ptr_deleted", ftype, + BUILT_IN_GCC_NESTED_PTR_DELETED, + "__gcc_nested_func_ptr_deleted", ECF_NOTHROW); + } ftype = build_function_type_list (void_type_node, ptr_type_node, ptr_type_node, NULL_TREE); |