mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-14 23:30:06 +00:00
b2c78ae69e
Before glibc 2.26, ld.so set dl_platform to "x86_64" and searched the
"x86_64" subdirectory when loading a shared library. ld.so in glibc
2.26 was changed to set dl_platform to "haswell" or "xeon_phi", based
on supported ISAs. This led to shared library loading failure for
shared libraries placed under the "x86_64" subdirectory.
This patch adds "x86_64" to x86-64 dl_hwcap so that ld.so will always
search the "x86_64" subdirectory when loading a shared library.
NB: We can't set x86-64 dl_platform to "x86-64" since ld.so will skip
the "haswell" and "xeon_phi" subdirectories on "haswell" and "xeon_phi"
machines.
Tested on i686 and x86-64.
[BZ #22093]
* sysdeps/x86/cpu-features.c (init_cpu_features): Initialize
GLRO(dl_hwcap) to HWCAP_X86_64 for x86-64.
* sysdeps/x86/dl-hwcap.h (HWCAP_COUNT): Updated.
(HWCAP_IMPORTANT): Likewise.
(HWCAP_X86_64): New enum.
(HWCAP_X86_AVX512_1): Updated.
* sysdeps/x86/dl-procinfo.c (_dl_x86_hwcap_flags): Add "x86_64".
* sysdeps/x86_64/Makefile (tests): Add tst-x86_64-1.
(modules-names): Add x86_64/tst-x86_64mod-1.
(LDFLAGS-tst-x86_64mod-1.so): New.
($(objpfx)tst-x86_64-1): Likewise.
($(objpfx)x86_64/tst-x86_64mod-1.os): Likewise.
(tst-x86_64-1-clean): Likewise.
* sysdeps/x86_64/tst-x86_64-1.c: New file.
* sysdeps/x86_64/tst-x86_64mod-1.c: Likewise.
(cherry picked from commit 45ff34638f)
89 lines
2.4 KiB
C
89 lines
2.4 KiB
C
/* Data for x86 version of processor capability information.
|
|
Copyright (C) 2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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,
|
|
HWCAP_PLATFORMS_START and HWCAP_PLATFORMS_COUNT definitions in
|
|
dl-hwcap.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.
|
|
*/
|
|
|
|
#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_hwcap_flags
|
|
#else
|
|
PROCINFO_CLASS const char _dl_x86_hwcap_flags[3][9]
|
|
#endif
|
|
#ifndef PROCINFO_DECL
|
|
= {
|
|
"sse2", "x86_64", "avx512_1"
|
|
}
|
|
#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][9]
|
|
#endif
|
|
#ifndef PROCINFO_DECL
|
|
= {
|
|
"i586", "i686", "haswell", "xeon_phi"
|
|
}
|
|
#endif
|
|
#if !defined SHARED || defined PROCINFO_DECL
|
|
;
|
|
#else
|
|
,
|
|
#endif
|