mirror of
git://git.musl-libc.org/musl
synced 2025-02-21 05:16:50 +00:00
fix visibility mismatch in dynamic linker stage 2 function definition
since commits2907afb8db
and6fc30c2493
, __dls2 is no longer called via symbol lookup, but instead uses relative addressing that needs to be resolved at link time. on some linker versions, and/or if -Bsymbolic-functions is not used, the linker may leave behind a dynamic relocation, which is not suitable for bootstrapping the dynamic linker, if the reference to __dls2 is marked hidden but the definition is not actually hidden. correcting the definition to use hidden visibility fixes the problem. the static-PIE entry point rcrt1 was likewise affected and is also fixed by this patch.
This commit is contained in:
parent
797899802d
commit
bc9b6ea0df
@ -9,6 +9,7 @@ void _fini() __attribute__((weak));
|
||||
_Noreturn int __libc_start_main(int (*)(), int, char **,
|
||||
void (*)(), void(*)(), void(*)());
|
||||
|
||||
__attribute__((__visibility__("hidden")))
|
||||
_Noreturn void __dls2(unsigned char *base, size_t *sp)
|
||||
{
|
||||
__libc_start_main(main, *sp, (void *)(sp+1), _init, _fini, 0);
|
||||
|
@ -1330,6 +1330,7 @@ static void update_tls_size()
|
||||
* linker itself, but some of the relocations performed may need to be
|
||||
* replaced later due to copy relocations in the main program. */
|
||||
|
||||
__attribute__((__visibility__("hidden")))
|
||||
void __dls2(unsigned char *base, size_t *sp)
|
||||
{
|
||||
if (DL_FDPIC) {
|
||||
|
Loading…
Reference in New Issue
Block a user