summaryrefslogtreecommitdiff
path: root/sysdeps/m68k/m680x0
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2021-10-11 16:01:49 -0300
committerCarlos O'Donell <carlos@redhat.com>2022-03-29 17:00:07 -0400
commitef2c249cbd8ca939b031bca89145e00d6cd47c91 (patch)
tree69bcd65868976a8eb9c6f313b9e780ed84bb65dd /sysdeps/m68k/m680x0
parent87bb97efa23eb2c332a81f00ad6a05540b39f3b9 (diff)
downloadglibc-ef2c249cbd8ca939b031bca89145e00d6cd47c91.tar.gz
elf: Fix elf_get_dynamic_info definition
Before to 490e6c62aa31a8a ('elf: Avoid nested functions in the loader [BZ #27220]'), elf_get_dynamic_info() was defined twice on rtld.c: on the first dynamic-link.h include and later within _dl_start(). The former definition did not define DONT_USE_BOOTSTRAP_MAP and it is used on setup_vdso() (since it is a global definition), while the former does define DONT_USE_BOOTSTRAP_MAP and it is used on loader self-relocation. With the commit change, the function is now included and defined once instead of defined as a nested function. So rtld.c defines without defining RTLD_BOOTSTRAP and it brokes at least powerpc32. This patch fixes by moving the get-dynamic-info.h include out of dynamic-link.h, which then the caller can corirectly set the expected semantic by defining STATIC_PIE_BOOTSTRAP, RTLD_BOOTSTRAP, and/or RESOLVE_MAP. It also required to enable some asserts only for the loader bootstrap to avoid issues when called from setup_vdso(). As a side note, this is another issues with nested functions: it is not clear from pre-processed output (-E -dD) how the function will be build and its semantic (since nested function will be local and extra C defines may change it). I checked on x86_64-linux-gnu (w/o --enable-static-pie), i686-linux-gnu, powerpc64-linux-gnu, powerpc-linux-gnu-power4, aarch64-linux-gnu, arm-linux-gnu, sparc64-linux-gnu, and s390x-linux-gnu. Reviewed-by: Fangrui Song <maskray@google.com> (cherry picked from commit 4af6982e4c9fc465ffb7a54b794aaaa134241f05) Resolved conflicts: elf/rtld.c
Diffstat (limited to 'sysdeps/m68k/m680x0')
0 files changed, 0 insertions, 0 deletions