mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-21 04:31:04 +08:00
e2e4f56056
This patch adds _dl_x86_cpu_features to rtld_global in x86 ld.so and initializes it early before __libc_start_main is called so that cpu_features is always available when it is used and we can avoid calling __init_cpu_features in IFUNC selectors. * sysdeps/i386/dl-machine.h: Include <cpu-features.c>. (dl_platform_init): Call init_cpu_features. * sysdeps/i386/dl-procinfo.c (_dl_x86_cpu_features): New. * sysdeps/i386/i686/cacheinfo.c (DISABLE_PREFERRED_MEMORY_INSTRUCTION): Removed. * sysdeps/i386/i686/multiarch/Makefile (aux): Remove init-arch. * sysdeps/i386/i686/multiarch/Versions: Removed. * sysdeps/i386/i686/multiarch/ifunc-defines.sym (KIND_OFFSET): Removed. * sysdeps/i386/ldsodefs.h: Include <cpu-features.h>. * sysdeps/unix/sysv/linux/x86/Makefile (libpthread-sysdep_routines): Remove init-arch. * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: Include <sysdeps/x86_64/dl-procinfo.c> instead of sysdeps/generic/dl-procinfo.c>. * sysdeps/x86/Makefile [$(subdir) == csu] (gen-as-const-headers): Add cpu-features-offsets.sym and rtld-global-offsets.sym. [$(subdir) == elf] (sysdep-dl-routines): Add dl-get-cpu-features. [$(subdir) == elf] (tests): Add tst-get-cpu-features. [$(subdir) == elf] (tests-static): Add tst-get-cpu-features-static. * sysdeps/x86/Versions: New file. * sysdeps/x86/cpu-features-offsets.sym: Likewise. * sysdeps/x86/cpu-features.c: Likewise. * sysdeps/x86/cpu-features.h: Likewise. * sysdeps/x86/dl-get-cpu-features.c: Likewise. * sysdeps/x86/libc-start.c: Likewise. * sysdeps/x86/rtld-global-offsets.sym: Likewise. * sysdeps/x86/tst-get-cpu-features-static.c: Likewise. * sysdeps/x86/tst-get-cpu-features.c: Likewise. * sysdeps/x86_64/dl-procinfo.c: Likewise. * sysdeps/x86_64/cacheinfo.c (__cpuid_count): Removed. Assume USE_MULTIARCH is defined and don't check it. (is_intel): Replace __cpu_features with GLRO(dl_x86_cpu_features). (is_amd): Likewise. (max_cpuid): Likewise. (intel_check_word): Likewise. (__cache_sysconf): Don't call __init_cpu_features. (__x86_preferred_memory_instruction): Removed. (init_cacheinfo): Don't call __init_cpu_features. Replace __cpu_features with GLRO(dl_x86_cpu_features). * sysdeps/x86_64/dl-machine.h: <cpu-features.c>. (dl_platform_init): Call init_cpu_features. * sysdeps/x86_64/ldsodefs.h: Include <cpu-features.h>. * sysdeps/x86_64/multiarch/Makefile (aux): Remove init-arch. * sysdeps/x86_64/multiarch/Versions: Removed. * sysdeps/x86_64/multiarch/cacheinfo.c: Likewise. * sysdeps/x86_64/multiarch/init-arch.c: Likewise. * sysdeps/x86_64/multiarch/ifunc-defines.sym (KIND_OFFSET): Removed. * sysdeps/x86_64/multiarch/init-arch.h: Rewrite.
99 lines
2.7 KiB
C
99 lines
2.7 KiB
C
/* Data for i386 version of processor capability information.
|
|
Copyright (C) 2001-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* This information must be kept in sync with the _DL_HWCAP_COUNT and
|
|
_DL_PLATFORM_COUNT definitions in procinfo.h.
|
|
|
|
If anything should be added here check whether the size of each string
|
|
is still ok with the given array size.
|
|
|
|
All the #ifdefs in the definitions are quite irritating but
|
|
necessary if we want to avoid duplicating the information. There
|
|
are three different modes:
|
|
|
|
- PROCINFO_DECL is defined. This means we are only interested in
|
|
declarations.
|
|
|
|
- PROCINFO_DECL is not defined:
|
|
|
|
+ if SHARED is defined the file is included in an array
|
|
initializer. The .element = { ... } syntax is needed.
|
|
|
|
+ if SHARED is not defined a normal array initialization is
|
|
needed.
|
|
*/
|
|
|
|
#ifndef PROCINFO_CLASS
|
|
# define PROCINFO_CLASS
|
|
#endif
|
|
|
|
#if !IS_IN (ldconfig)
|
|
# if !defined PROCINFO_DECL && defined SHARED
|
|
._dl_x86_cpu_features
|
|
# else
|
|
PROCINFO_CLASS struct cpu_features _dl_x86_cpu_features
|
|
# endif
|
|
# ifndef PROCINFO_DECL
|
|
= { }
|
|
# endif
|
|
# if !defined SHARED || defined PROCINFO_DECL
|
|
;
|
|
# else
|
|
,
|
|
# endif
|
|
#endif
|
|
|
|
#if !defined PROCINFO_DECL && defined SHARED
|
|
._dl_x86_cap_flags
|
|
#else
|
|
PROCINFO_CLASS const char _dl_x86_cap_flags[32][8]
|
|
#endif
|
|
#ifndef PROCINFO_DECL
|
|
= {
|
|
"fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
|
|
"cx8", "apic", "10", "sep", "mtrr", "pge", "mca", "cmov",
|
|
"pat", "pse36", "pn", "clflush", "20", "dts", "acpi", "mmx",
|
|
"fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe"
|
|
}
|
|
#endif
|
|
#if !defined SHARED || defined PROCINFO_DECL
|
|
;
|
|
#else
|
|
,
|
|
#endif
|
|
|
|
#if !defined PROCINFO_DECL && defined SHARED
|
|
._dl_x86_platforms
|
|
#else
|
|
PROCINFO_CLASS const char _dl_x86_platforms[4][5]
|
|
#endif
|
|
#ifndef PROCINFO_DECL
|
|
= {
|
|
"i386", "i486", "i586", "i686"
|
|
}
|
|
#endif
|
|
#if !defined SHARED || defined PROCINFO_DECL
|
|
;
|
|
#else
|
|
,
|
|
#endif
|
|
|
|
#undef PROCINFO_DECL
|
|
#undef PROCINFO_CLASS
|