Florian Weimer
parent
d629b47ec4
commit
cc6e84070f
|
|
@ -0,0 +1,211 @@
|
|||
commit 45ff34638f034877b6a490c217d6a0632ce263f4
|
||||
Author: H.J. Lu <hjl.tools@gmail.com>
|
||||
Date: Mon Sep 11 08:18:11 2017 -0700
|
||||
|
||||
x86: Add x86_64 to x86-64 HWCAP [BZ #22093]
|
||||
|
||||
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.
|
||||
|
||||
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
|
||||
index 6f900840d45c5cb3..c267f17b7633e3be 100644
|
||||
--- a/sysdeps/x86/cpu-features.c
|
||||
+++ b/sysdeps/x86/cpu-features.c
|
||||
@@ -336,7 +336,6 @@ no_cpuid:
|
||||
|
||||
/* Reuse dl_platform, dl_hwcap and dl_hwcap_mask for x86. */
|
||||
GLRO(dl_platform) = NULL;
|
||||
- GLRO(dl_hwcap) = 0;
|
||||
#if !HAVE_TUNABLES && defined SHARED
|
||||
/* The glibc.tune.hwcap_mask tunable is initialized already, so no need to do
|
||||
this. */
|
||||
@@ -344,6 +343,7 @@ no_cpuid:
|
||||
#endif
|
||||
|
||||
#ifdef __x86_64__
|
||||
+ GLRO(dl_hwcap) = HWCAP_X86_64;
|
||||
if (cpu_features->kind == arch_kind_intel)
|
||||
{
|
||||
if (CPU_FEATURES_ARCH_P (cpu_features, AVX512F_Usable)
|
||||
@@ -374,6 +374,7 @@ no_cpuid:
|
||||
GLRO(dl_platform) = "haswell";
|
||||
}
|
||||
#else
|
||||
+ GLRO(dl_hwcap) = 0;
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, SSE2))
|
||||
GLRO(dl_hwcap) |= HWCAP_X86_SSE2;
|
||||
|
||||
diff --git a/sysdeps/x86/dl-hwcap.h b/sysdeps/x86/dl-hwcap.h
|
||||
index c95668415ab850b4..38627e9eefb4f0b1 100644
|
||||
--- a/sysdeps/x86/dl-hwcap.h
|
||||
+++ b/sysdeps/x86/dl-hwcap.h
|
||||
@@ -24,15 +24,16 @@
|
||||
# define HWCAP_PLATFORMS_START 0
|
||||
# define HWCAP_PLATFORMS_COUNT 4
|
||||
# define HWCAP_START 0
|
||||
-# define HWCAP_COUNT 2
|
||||
-# define HWCAP_IMPORTANT (HWCAP_X86_SSE2 | HWCAP_X86_AVX512_1)
|
||||
+# 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 2
|
||||
-# define HWCAP_IMPORTANT (HWCAP_X86_AVX512_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
|
||||
@@ -45,7 +46,8 @@
|
||||
enum
|
||||
{
|
||||
HWCAP_X86_SSE2 = 1 << 0,
|
||||
- HWCAP_X86_AVX512_1 = 1 << 1
|
||||
+ HWCAP_X86_64 = 1 << 1,
|
||||
+ HWCAP_X86_AVX512_1 = 1 << 2
|
||||
};
|
||||
|
||||
static inline const char *
|
||||
diff --git a/sysdeps/x86/dl-procinfo.c b/sysdeps/x86/dl-procinfo.c
|
||||
index 43ab8fe25b8e6894..0192feb850006f33 100644
|
||||
--- a/sysdeps/x86/dl-procinfo.c
|
||||
+++ b/sysdeps/x86/dl-procinfo.c
|
||||
@@ -58,11 +58,11 @@ PROCINFO_CLASS struct cpu_features _dl_x86_cpu_features
|
||||
#if !defined PROCINFO_DECL && defined SHARED
|
||||
._dl_x86_hwcap_flags
|
||||
#else
|
||||
-PROCINFO_CLASS const char _dl_x86_hwcap_flags[2][9]
|
||||
+PROCINFO_CLASS const char _dl_x86_hwcap_flags[3][9]
|
||||
#endif
|
||||
#ifndef PROCINFO_DECL
|
||||
= {
|
||||
- "sse2", "avx512_1"
|
||||
+ "sse2", "x86_64", "avx512_1"
|
||||
}
|
||||
#endif
|
||||
#if !defined SHARED || defined PROCINFO_DECL
|
||||
diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
|
||||
index 132470d9cb83c2a5..457cf5d129da3ff2 100644
|
||||
--- a/sysdeps/x86_64/Makefile
|
||||
+++ b/sysdeps/x86_64/Makefile
|
||||
@@ -52,6 +52,12 @@ $(objpfx)tst-quad2pie: $(objpfx)tst-quadmod2pie.o
|
||||
CFLAGS-tst-quad1pie.c = $(PIE-ccflag)
|
||||
CFLAGS-tst-quad2pie.c = $(PIE-ccflag)
|
||||
|
||||
+tests += tst-x86_64-1
|
||||
+modules-names += x86_64/tst-x86_64mod-1
|
||||
+LDFLAGS-tst-x86_64mod-1.so = -Wl,-soname,tst-x86_64mod-1.so
|
||||
+
|
||||
+$(objpfx)tst-x86_64-1: $(objpfx)x86_64/tst-x86_64mod-1.so
|
||||
+
|
||||
tests += tst-audit3 tst-audit4 tst-audit5 tst-audit6 tst-audit7 \
|
||||
tst-audit10 tst-sse tst-avx tst-avx512
|
||||
test-extras += tst-audit4-aux tst-audit10-aux \
|
||||
@@ -122,3 +128,14 @@ endif
|
||||
ifeq ($(subdir),csu)
|
||||
gen-as-const-headers += tlsdesc.sym rtld-offsets.sym
|
||||
endif
|
||||
+
|
||||
+$(objpfx)x86_64/tst-x86_64mod-1.os: $(objpfx)tst-x86_64mod-1.os
|
||||
+ $(make-target-directory)
|
||||
+ rm -f $@
|
||||
+ ln $< $@
|
||||
+
|
||||
+do-tests-clean common-mostlyclean: tst-x86_64-1-clean
|
||||
+
|
||||
+.PHONY: tst-x86_64-1-clean
|
||||
+tst-x86_64-1-clean:
|
||||
+ -rm -rf $(objpfx)x86_64
|
||||
diff --git a/sysdeps/x86_64/tst-x86_64-1.c b/sysdeps/x86_64/tst-x86_64-1.c
|
||||
new file mode 100644
|
||||
index 0000000000000000..ba1a55cdaf1e227c
|
||||
--- /dev/null
|
||||
+++ b/sysdeps/x86_64/tst-x86_64-1.c
|
||||
@@ -0,0 +1,26 @@
|
||||
+/* Test searching the "x86_64" directory for shared libraries.
|
||||
+ 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/>. */
|
||||
+
|
||||
+extern void foo (void);
|
||||
+
|
||||
+int
|
||||
+main (void)
|
||||
+{
|
||||
+ foo ();
|
||||
+ return 0;
|
||||
+}
|
||||
diff --git a/sysdeps/x86_64/tst-x86_64mod-1.c b/sysdeps/x86_64/tst-x86_64mod-1.c
|
||||
new file mode 100644
|
||||
index 0000000000000000..83dfafb5a83c9a85
|
||||
--- /dev/null
|
||||
+++ b/sysdeps/x86_64/tst-x86_64mod-1.c
|
||||
@@ -0,0 +1,22 @@
|
||||
+/* Test searching the "x86_64" directory for shared libraries.
|
||||
+ 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/>. */
|
||||
+
|
||||
+void
|
||||
+foo (void)
|
||||
+{
|
||||
+}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
%define glibcsrcdir glibc-2.26-65-ga76376df7c
|
||||
%define glibcversion 2.26
|
||||
%define glibcrelease 15%{?dist}
|
||||
%define glibcrelease 16%{?dist}
|
||||
# Pre-release tarballs are pulled in from git using a command that is
|
||||
# effectively:
|
||||
#
|
||||
|
|
@ -238,6 +238,7 @@ Patch63: glibc-rh1498880-1.patch
|
|||
Patch64: glibc-rh1498880-2.patch
|
||||
Patch65: glibc-nscd-reproducible.patch
|
||||
Patch66: glibc-nss_compat.patch
|
||||
Patch61: glibc-rh1506802.patch
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
|
|
@ -871,6 +872,7 @@ microbenchmark tests on the system.
|
|||
%patch64 -p1
|
||||
%patch65 -p1
|
||||
%patch66 -p1
|
||||
%patch61 -p1
|
||||
|
||||
##############################################################################
|
||||
# %%prep - Additional prep required...
|
||||
|
|
@ -2283,6 +2285,9 @@ rm -f *.filelist*
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Nov 2 2017 Florian Weimer <fweimer@redhat.com> - 2.26-16
|
||||
- x86: Add x86_64 to x86-64 HWCAP (#1506802)
|
||||
|
||||
* Sat Oct 21 2017 Florian Weimer <fweimer@redhat.com> - 2.26-15
|
||||
- Auto-sync with upstream branch release/2.26/master,
|
||||
commit a76376df7c07e577a9515c3faa5dbd50bda5da07:
|
||||
|
|
|
|||
Loading…
Reference in New Issue