diff options
| author | Alan Modra <amodra@gmail.com> | 2022-01-24 07:58:18 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2022-04-10 08:33:40 +0930 |
| commit | 31a9bc8c55adc2a8d6f8f795a577ba5d5eca7506 (patch) | |
| tree | bc13ea619de5d93042bd2c1335af37a51e9c5baa /sysdeps/powerpc/hwcapinfo.c | |
| parent | d6efcc118e406a1cfeb309f835d7118df53419bb (diff) | |
| download | glibc-31a9bc8c55adc2a8d6f8f795a577ba5d5eca7506.tar.gz glibc-31a9bc8c55adc2a8d6f8f795a577ba5d5eca7506.tar.xz glibc-31a9bc8c55adc2a8d6f8f795a577ba5d5eca7506.zip | |
powerpc64: Set up thread register for _dl_relocate_static_pie
libgcc ifunc resolvers that access hwcap via a field in the tcb can't be called until the thread pointer is set up. Other ifunc resolvers might need access to at_platform. This patch sets up a fake thread pointer early to a copy of tcbhead_t. hwcapinfo.c already had local variables for hwcap and at_platform, replace them with an entire tcbhead_t. It's not that large and this way we easily ensure hwcap and at_platform are at the same relative offsets as they are in the real thread block. The patch also conditionally disables part of tst-tlsifunc-static, "bar address read from IFUNC resolver is incorrect". We can't get a proper address for a thread variable before glibc initialises tls. Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
Diffstat (limited to 'sysdeps/powerpc/hwcapinfo.c')
| -rw-r--r-- | sysdeps/powerpc/hwcapinfo.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sysdeps/powerpc/hwcapinfo.c b/sysdeps/powerpc/hwcapinfo.c index e030e322bd..afde05f863 100644 --- a/sysdeps/powerpc/hwcapinfo.c +++ b/sysdeps/powerpc/hwcapinfo.c @@ -20,8 +20,7 @@ #include <shlib-compat.h> #include <dl-procinfo.h> -uint64_t __tcb_hwcap __attribute__ ((visibility ("hidden"))); -uint32_t __tcb_platform __attribute__ ((visibility ("hidden"))); +tcbhead_t __tcb __attribute__ ((visibility ("hidden"))); /* This function parses the HWCAP/HWCAP2 fields, adding the previous supported ISA bits, as well as converting the AT_PLATFORM string to a number. This @@ -34,7 +33,7 @@ __tcb_parse_hwcap_and_convert_at_platform (void) uint64_t h1, h2; /* Read AT_PLATFORM string from auxv and convert it to a number. */ - __tcb_platform = _dl_string_platform (GLRO (dl_platform)); + __tcb.at_platform = _dl_string_platform (GLRO (dl_platform)); /* Read HWCAP and HWCAP2 from auxv. */ h1 = GLRO (dl_hwcap); @@ -66,8 +65,7 @@ __tcb_parse_hwcap_and_convert_at_platform (void) /* Consolidate both HWCAP and HWCAP2 into a single doubleword so that we can read both in a single load later. */ - __tcb_hwcap = h2; - __tcb_hwcap = (h1 << 32) | __tcb_hwcap; + __tcb.hwcap = (h1 << 32) | (h2 & 0xffffffff); } #if IS_IN (rtld) |