aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile2
-rw-r--r--elf/Versions22
2 files changed, 18 insertions, 6 deletions
diff --git a/elf/Makefile b/elf/Makefile
index e98fa40..1706efc 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -55,7 +55,7 @@ endif
before-compile = $(objpfx)trusted-dirs.h
ifeq ($(versioning),yes)
-ld-map = $(common-objpfx)libc.map
+ld-map = $(common-objpfx)ld.so.map
endif
ifeq (yes,$(build-shared))
diff --git a/elf/Versions b/elf/Versions
index ff01d78..8e6dca8 100644
--- a/elf/Versions
+++ b/elf/Versions
@@ -1,11 +1,19 @@
libc {
GLIBC_2.0 {
+ # functions used in other libraries
+ _dl_open; _dl_close; _dl_addr;
+ }
+ GLIBC_2.1 {
+ # functions used in other libraries
+ _dl_mcount_wrapper; _dl_mcount_wrapper_check;
+ }
+}
+
+ld.so {
+ GLIBC_2.0 {
# global variables
_dl_debug_impcalls; _dl_debug_fd;
- # functions used in other libraries
- _dl_open; _dl_close; _dl_addr; _dl_sysdep_output; _dl_debug_message;
-
# Those are in the dynamic linker, but used by libc.so.
__libc_enable_secure; _dl_catch_error; _dl_check_all_versions;
_dl_debug_initialize; _dl_debug_state; _dl_default_scope;
@@ -15,15 +23,19 @@ libc {
_dl_sysdep_start; _r_debug;
_dl_global_scope; _dl_lookup_symbol_skip;
_dl_lookup_versioned_symbol; _dl_lookup_versioned_symbol_skip;
+ _dl_debug_message;
+
+ # Function from libc.so which must be shared with libc.
+ calloc; free; malloc; realloc;
}
GLIBC_2.1 {
# global variables
_dl_profile; _dl_profile_map; _dl_profile_output; _dl_start_profile;
_dl_loaded; _dl_main_searchlist; _dl_fpu_control; _dl_initial_searchlist;
- _dl_global_scope_alloc;
+ _dl_global_scope_alloc; __libc_stack_end;
# functions used in other libraries
- _dl_mcount; _dl_mcount_wrapper; _dl_mcount_wrapper_check; _dl_unload_cache;
+ _dl_mcount; _dl_unload_cache;
}
}