mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-11 22:00:08 +00:00
b19de59d62
dynamic-link.h is included more than once in some elf/ files (rtld.c,
dl-conflict.c, dl-reloc.c, dl-reloc-static-pie.c) and uses GCC nested
functions. This harms readability and the nested functions usage
is the biggest obstacle prevents Clang build (Clang doesn't support GCC
nested functions).
The key idea for unnesting is to add extra parameters (struct link_map
*and struct r_scope_elm *[]) to RESOLVE_MAP,
ELF_MACHINE_BEFORE_RTLD_RELOC, ELF_DYNAMIC_RELOCATE, elf_machine_rel[a],
elf_machine_lazy_rel, and elf_machine_runtime_setup. (This is inspired
by Stan Shebs' ppc64/x86-64 implementation in the
google/grte/v5-2.27/master which uses mixed extra parameters and static
variables.)
Future simplification:
* If mips elf_machine_runtime_setup no longer needs RESOLVE_GOTSYM,
elf_machine_runtime_setup can drop the `scope` parameter.
* If TLSDESC no longer need to be in elf_machine_lazy_rel,
elf_machine_lazy_rel can drop the `scope` parameter.
Tested on aarch64, i386, x86-64, powerpc64le, powerpc64, powerpc32,
sparc64, sparcv9, s390x, s390, hppa, ia64, armhf, alpha, and mips64.
In addition, tested build-many-glibcs.py with {arc,csky,microblaze,nios2}-linux-gnu
and riscv64-linux-gnu-rv64imafdc-lp64d.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
(cherry picked from commit
|
||
|---|---|---|
| .. | ||
| bits | ||
| fpu | ||
| nofpu | ||
| nptl | ||
| __longjmp.S | ||
| abort-instr.h | ||
| atomic-machine.h | ||
| bsd-_setjmp.S | ||
| bsd-setjmp.S | ||
| configure | ||
| configure.ac | ||
| dl-machine.h | ||
| dl-runtime.h | ||
| dl-sysdep.h | ||
| dl-tls.h | ||
| dl-trampoline.S | ||
| entry.h | ||
| fpu_control.h | ||
| gccframe.h | ||
| get-rounding-mode.h | ||
| Implies | ||
| jmpbuf-offsets.h | ||
| jmpbuf-unwind.h | ||
| ldsodefs.h | ||
| libc-tls.c | ||
| machine-gmon.h | ||
| Makefile | ||
| math-tests-trap.h | ||
| memusage.h | ||
| preconfigure | ||
| setjmp.S | ||
| sfp-machine.h | ||
| sotruss-lib.c | ||
| stackinfo.h | ||
| start.S | ||
| sysdep.h | ||
| tininess.h | ||
| tls-macros.h | ||
| tst-audit.h | ||
| Versions | ||