diff options
author | Carlos Eduardo Seo <cseo@linux.vnet.ibm.com> | 2015-10-22 19:26:58 -0500 |
---|---|---|
committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2015-12-03 13:56:13 -0200 |
commit | 67385a01d229751569b6aac067ffdcd813a15d7a (patch) | |
tree | 2012071b67d002ad49438bd7d626f7b4514bbdce /sysdeps/unix/sysv/linux/powerpc | |
parent | db340c904dd519142025a09190bf48ad28152ab9 (diff) | |
download | glibc-67385a01d229751569b6aac067ffdcd813a15d7a.tar.gz glibc-67385a01d229751569b6aac067ffdcd813a15d7a.tar.xz glibc-67385a01d229751569b6aac067ffdcd813a15d7a.zip |
powerpc: Add hwcap/hwcap2/platform data to TCB.
This patch adds a new feature for powerpc. In order to get faster access to the HWCAP/HWCAP2 bits and platform number (i.e. for implementing __builtin_cpu_is () / __builtin_cpu_supports () in GCC) without the overhead of reading from the auxiliary vector, we now reserve space for them in the TCB. This is an ABI change for GLIBC 2.23. A new versioned symbol '__parse_hwcap_and_convert_at_platform' is available to get the data from the auxiliary vector and parse it, and store it for later use in the TLS initialization code. This function is called very early (in _dl_sysdep_start () via DL_PLATFORM_INFO for the dynamic linking case, and in __libc_start_main () for the static linking case) to make sure the data is available at the time of TLS initialization. * sysdeps/powerpc/Makefile (sysdep-dl-routines): Add hwcapinfo. (sysdep_routines): Likewise. (sysdep-rtld-routines): Likewise. [$(subdir) = nptl](tests): Add test-get_hwcap and test-get_hwcap-static [$(subdir) = nptl](tests-static): test-get_hwcap-static * sysdeps/powerpc/Versions: Added new __parse_hwcap_and_convert_at_platform symbol to GLIBC-2.23. * sysdeps/powerpc/hwcapinfo.c: New file. (__tcb_parse_hwcap_and_convert_at_platform): New function to initialize and parse hwcap, hwcap2 and platform number information. * sysdeps/powerpc/hwcapinfo.h: New file. Creates global variables to store HWCAP+HWCAP2 and platform number. * sysdeps/powerpc/nptl/tcb-offsets.sym: Added new offsets for HWCAP+HWCAP2 and platform number in the TCB. * sysdeps/powerpc/nptl/tls.h: New functionality. Stores the HWCAP, HWCAP2 and platform number in the TCB. (dtv): Added new fields for HWCAP+HWCAP2 and platform number. (TLS_INIT_TP): Included calls to add the hwcap and at_platform values in the TCB in TP initialization. (TLS_DEFINE_INIT_TP): Likewise. (THREAD_GET_HWCAP): New macro. (THREAD_SET_HWCAP): Likewise. (THREAD_GET_AT_PLATFORM): Likewise. (THREAD_SET_AT_PLATFORM): Likewise. * sysdeps/powerpc/powerpc32/dl-machine.h: (dl_platform_init): New function that calls __parse_hwcap_and_convert_at_platform for the dymanic linking case for powerpc32. * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise, for powerpc64. * sysdeps/powerpc/test-get_hwcap-static.c: New file. Testcase for this functionality, static linking case. * sysdeps/powerpc/test-get_hwcap.c: New file. Likewise, dynamic linking case. * sysdeps/unix/sysv/linux/powerpc/libc-start.c: Added call to __parse_hwcap_and_convert_at_platform for the static linking case. * sysdeps/unix/sysv/linux/powerpc/powerpc32/ld.abilist: Included the new __parse_hwcap_and_convert_at_platform symbol in the ABI list for GLIBC 2.23. * sysdeps/unix/sysv/linux/powerpc/powerpc64/ld-le.abilist: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/ld.abilist: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/powerpc')
4 files changed, 29 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/powerpc/libc-start.c b/sysdeps/unix/sysv/linux/powerpc/libc-start.c index a9364c786a..209a16d88c 100644 --- a/sysdeps/unix/sysv/linux/powerpc/libc-start.c +++ b/sysdeps/unix/sysv/linux/powerpc/libc-start.c @@ -20,6 +20,9 @@ #include <ldsodefs.h> #include <sysdep.h> +#ifndef SHARED +#include <hwcapinfo.h> +#endif int __cache_line_size attribute_hidden; /* The main work is done in the generic function. */ @@ -68,15 +71,34 @@ __libc_start_main (int argc, char **argv, rtld_fini = NULL; } - /* Initialize the __cache_line_size variable from the aux vector. */ + /* Initialize the __cache_line_size variable from the aux vector. For the + static case, we also need _dl_hwcap, _dl_hwcap2 and _dl_platform, so we + can call __tcb_parse_hwcap_and_convert_at_platform (). */ for (ElfW (auxv_t) * av = auxvec; av->a_type != AT_NULL; ++av) switch (av->a_type) { case AT_DCACHEBSIZE: __cache_line_size = av->a_un.a_val; break; +#ifndef SHARED + case AT_HWCAP: + _dl_hwcap = (unsigned long int) av->a_un.a_val; + break; + case AT_HWCAP2: + _dl_hwcap2 = (unsigned long int) av->a_un.a_val; + break; + case AT_PLATFORM: + _dl_platform = (void *) av->a_un.a_val; + break; +#endif } + /* Initialize hwcap/hwcap2 and platform data so it can be copied to + the TCB later in __libc_setup_tls (). (static case only). */ +#ifndef SHARED + __tcb_parse_hwcap_and_convert_at_platform (); +#endif + return generic_start_main (stinfo->main, argc, argv, auxvec, stinfo->init, stinfo->fini, rtld_fini, stack_on_entry); diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/ld.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/ld.abilist index 6f554dcad5..2eb4d5fef1 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/ld.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/ld.abilist @@ -10,6 +10,8 @@ GLIBC_2.1 __libc_stack_end D 0x4 GLIBC_2.1 _dl_mcount F GLIBC_2.22 GLIBC_2.22 A GLIBC_2.22 __tls_get_addr_opt F +GLIBC_2.23 GLIBC_2.23 A +GLIBC_2.23 __parse_hwcap_and_convert_at_platform F GLIBC_2.3 GLIBC_2.3 A GLIBC_2.3 __tls_get_addr F GLIBC_2.4 GLIBC_2.4 A diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/ld-le.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/ld-le.abilist index 15553c156f..27d451b46b 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/ld-le.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/ld-le.abilist @@ -10,3 +10,5 @@ GLIBC_2.17 malloc F GLIBC_2.17 realloc F GLIBC_2.22 GLIBC_2.22 A GLIBC_2.22 __tls_get_addr_opt F +GLIBC_2.23 GLIBC_2.23 A +GLIBC_2.23 __parse_hwcap_and_convert_at_platform F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/ld.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/ld.abilist index ca573ea447..8914eb06b4 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/ld.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/ld.abilist @@ -1,5 +1,7 @@ GLIBC_2.22 GLIBC_2.22 A GLIBC_2.22 __tls_get_addr_opt F +GLIBC_2.23 GLIBC_2.23 A +GLIBC_2.23 __parse_hwcap_and_convert_at_platform F GLIBC_2.3 GLIBC_2.3 A GLIBC_2.3 __libc_memalign F GLIBC_2.3 __libc_stack_end D 0x8 |