mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-12 02:53:34 +08:00
45ff34638f
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.
78 lines
2.2 KiB
C
78 lines
2.2 KiB
C
/* x86 version of hardware capability information handling macros.
|
|
Copyright (C) 2017 Free Software Foundation, Inc.
|
|
|
|
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/>. */
|
|
|
|
#ifndef _DL_HWCAP_H
|
|
#define _DL_HWCAP_H
|
|
|
|
#if IS_IN (ldconfig)
|
|
/* Since ldconfig processes both i386 and x86-64 libraries, it needs
|
|
to cover all platforms and hardware capabilities. */
|
|
# define HWCAP_PLATFORMS_START 0
|
|
# define HWCAP_PLATFORMS_COUNT 4
|
|
# define HWCAP_START 0
|
|
# define HWCAP_COUNT 3
|
|
# define HWCAP_IMPORTANT \
|
|
(HWCAP_X86_SSE2 | HWCAP_X86_64 | HWCAP_X86_AVX512_1)
|
|
#elif defined __x86_64__
|
|
/* For 64 bit, only cover x86-64 platforms and capabilities. */
|
|
# define HWCAP_PLATFORMS_START 2
|
|
# define HWCAP_PLATFORMS_COUNT 4
|
|
# define HWCAP_START 1
|
|
# define HWCAP_COUNT 3
|
|
# define HWCAP_IMPORTANT (HWCAP_X86_64 | HWCAP_X86_AVX512_1)
|
|
#else
|
|
/* For 32 bit, only cover i586, i686 and SSE2. */
|
|
# define HWCAP_PLATFORMS_START 0
|
|
# define HWCAP_PLATFORMS_COUNT 2
|
|
# define HWCAP_START 0
|
|
# define HWCAP_COUNT 1
|
|
# define HWCAP_IMPORTANT (HWCAP_X86_SSE2)
|
|
#endif
|
|
|
|
enum
|
|
{
|
|
HWCAP_X86_SSE2 = 1 << 0,
|
|
HWCAP_X86_64 = 1 << 1,
|
|
HWCAP_X86_AVX512_1 = 1 << 2
|
|
};
|
|
|
|
static inline const char *
|
|
__attribute__ ((unused))
|
|
_dl_hwcap_string (int idx)
|
|
{
|
|
return GLRO(dl_x86_hwcap_flags)[idx];
|
|
};
|
|
|
|
static inline int
|
|
__attribute__ ((unused, always_inline))
|
|
_dl_string_hwcap (const char *str)
|
|
{
|
|
int i;
|
|
|
|
for (i = HWCAP_START; i < HWCAP_COUNT; i++)
|
|
{
|
|
if (strcmp (str, GLRO(dl_x86_hwcap_flags)[i]) == 0)
|
|
return i;
|
|
}
|
|
return -1;
|
|
};
|
|
|
|
/* We cannot provide a general printing function. */
|
|
#define _dl_procinfo(type, word) -1
|
|
|
|
#endif /* dl-hwcap.h */
|