mirror of
https://sourceware.org/git/glibc.git
synced 2025-01-05 17:11:06 +00:00
2422c6032f
This makes the __tls_get_addr_opt test run as a shared library, and so
actually test that DTPMOD64/DTPREL64 pairs are processed by ld.so to
support the __tls_get_adfr_opt call stub fast return. After a
2017-01-24 patch (binutils f0158f4416) ld.bfd no longer emitted
unnecessary dynamic relocations against local thread variables,
instead setting up the __tls_index GOT entries for the call stub fast
return. This meant tst-tlsopt-powerpc passed but did not check ld.so
relocation support. After a 2017-07-16 patch (binutils 676ee2b5fa)
ld.bfd no longer set up the __tls_index GOT entries for the call stub
fast return, and tst-tlsopt-powerpc failed.
Compiling mod-tlsopt-powerpc.c with -DSHARED exposed a bug in
powerpc64/tls-macros.h, which defines a __TLS_GET_ADDR macro that
clashes with one defined in dl-tls.h. The tls-macros.h version is
only used in that file, so delete it and expand.
* sysdeps/powerpc/mod-tlsopt-powerpc.c: Extract from
tst-tlsopt-powerpc.c with function name change and no test harness.
* sysdeps/powerpc/tst-tlsopt-powerpc.c: Remove body of test.
Call tls_get_addr_opt_test.
* sysdeps/powerpc/Makefile (LDFLAGS-tst-tlsopt-powerpc): Don't define.
(modules-names): Add mod-tlsopt-powerpc.
(mod-tlsopt-powerpc.so-no-z-defs): Define.
(tst-tlsopt-powerpc): Depend on .so.
* sysdeps/powerpc/powerpc64/tls-macros.h (__TLS_GET_ADDR): Don't
define. Expand use in TLS_GD and TLS_LD.
(cherry picked from commit e98c925fa4)
53 lines
1.3 KiB
Makefile
53 lines
1.3 KiB
Makefile
ifeq ($(subdir),string)
|
|
CFLAGS-memcmp.c += -Wno-uninitialized
|
|
endif
|
|
|
|
ifeq ($(subdir),elf)
|
|
# extra shared linker files to link into dl-allobjs.so and libc
|
|
sysdep-dl-routines += dl-machine hwcapinfo
|
|
sysdep_routines += dl-machine hwcapinfo
|
|
# extra shared linker files to link only into dl-allobjs.so
|
|
sysdep-rtld-routines += dl-machine hwcapinfo
|
|
|
|
modules-names += mod-tlsopt-powerpc
|
|
mod-tlsopt-powerpc.so-no-z-defs = yes
|
|
tests += tst-tlsopt-powerpc
|
|
$(objpfx)tst-tlsopt-powerpc: $(objpfx)mod-tlsopt-powerpc.so
|
|
|
|
ifneq (no,$(multi-arch))
|
|
tests-static += tst-tlsifunc-static
|
|
tests-internal += tst-tlsifunc-static
|
|
ifeq (yes,$(build-shared))
|
|
tests-internal += tst-tlsifunc
|
|
endif # build-shared
|
|
endif # multi-arch
|
|
endif # subdir = elf
|
|
|
|
ifeq ($(subdir),setjmp)
|
|
ifeq (yes,$(build-shared))
|
|
sysdep_routines += novmx-longjmp novmx-sigjmp
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(subdir),csu)
|
|
# get offset to rtld_global._dl_hwcap and rtld_global._dl_hwcap2
|
|
gen-as-const-headers += rtld-global-offsets.sym
|
|
# get offset to __locale_struct.__ctype_tolower
|
|
gen-as-const-headers += locale-defines.sym
|
|
endif
|
|
|
|
ifeq ($(subdir),nptl)
|
|
tests-internal += test-get_hwcap test-get_hwcap-static
|
|
tests-static += test-get_hwcap-static
|
|
endif
|
|
|
|
ifeq ($(subdir),misc)
|
|
sysdep_headers += sys/platform/ppc.h
|
|
tests += test-gettimebase
|
|
tests += tst-set_ppr
|
|
endif
|
|
|
|
ifneq (,$(filter %le,$(config-machine)))
|
|
abilist-pattern = %-le.abilist
|
|
endif
|