mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
elf: Always provide _dl_get_dl_main_map in libc.a
Always provide _dl_get_dl_main_map in libc.a. It will be used by x86 to process PT_GNU_PROPERTY segment.
This commit is contained in:
parent
edb5e0c8f9
commit
8d9f9c4460
2 changed files with 3 additions and 6 deletions
|
@ -344,7 +344,6 @@ _dl_non_dynamic_init (void)
|
||||||
DL_SYSINFO_IMPLEMENTATION
|
DL_SYSINFO_IMPLEMENTATION
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLE_STATIC_PIE
|
|
||||||
/* Since relocation to hidden _dl_main_map causes relocation overflow on
|
/* Since relocation to hidden _dl_main_map causes relocation overflow on
|
||||||
aarch64, a function is used to get the address of _dl_main_map. */
|
aarch64, a function is used to get the address of _dl_main_map. */
|
||||||
|
|
||||||
|
@ -353,7 +352,6 @@ _dl_get_dl_main_map (void)
|
||||||
{
|
{
|
||||||
return &_dl_main_map;
|
return &_dl_main_map;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
/* This is used by _dl_runtime_profile, not used on static code. */
|
/* This is used by _dl_runtime_profile, not used on static code. */
|
||||||
void
|
void
|
||||||
|
|
|
@ -1172,10 +1172,6 @@ void __libc_setup_tls (void);
|
||||||
# if ENABLE_STATIC_PIE
|
# if ENABLE_STATIC_PIE
|
||||||
/* Relocate static executable with PIE. */
|
/* Relocate static executable with PIE. */
|
||||||
extern void _dl_relocate_static_pie (void) attribute_hidden;
|
extern void _dl_relocate_static_pie (void) attribute_hidden;
|
||||||
|
|
||||||
/* Get a pointer to _dl_main_map. */
|
|
||||||
extern struct link_map * _dl_get_dl_main_map (void)
|
|
||||||
__attribute__ ((visibility ("hidden")));
|
|
||||||
# else
|
# else
|
||||||
# define _dl_relocate_static_pie()
|
# define _dl_relocate_static_pie()
|
||||||
# endif
|
# endif
|
||||||
|
@ -1217,6 +1213,9 @@ rtld_hidden_proto (_dl_deallocate_tls)
|
||||||
|
|
||||||
extern void _dl_nothread_init_static_tls (struct link_map *) attribute_hidden;
|
extern void _dl_nothread_init_static_tls (struct link_map *) attribute_hidden;
|
||||||
|
|
||||||
|
/* Get a pointer to _dl_main_map. */
|
||||||
|
extern struct link_map * _dl_get_dl_main_map (void) attribute_hidden;
|
||||||
|
|
||||||
/* Find origin of the executable. */
|
/* Find origin of the executable. */
|
||||||
extern const char *_dl_get_origin (void) attribute_hidden;
|
extern const char *_dl_get_origin (void) attribute_hidden;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue