forked from pool/glibc
Andreas Schwab
a8510adeb1
- glob64-s390.patch: no compat glob64 on s390 - noversion.tar.bz2: remove unused source - x86-64-dl-platform.patch: Don't set GLRO(dl_platform) to NULL (BZ #22299) OBS-URL: https://build.opensuse.org/request/show/555876 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=485
197 lines
6.9 KiB
Diff
197 lines
6.9 KiB
Diff
2017-10-26 Valery Reznic <valery_reznic@yahoo.com>
|
|
H.J. Lu <hongjiu.lu@intel.com>
|
|
|
|
[BZ #22299]
|
|
* sysdeps/x86/cpu-features.c (init_cpu_features): Don't set
|
|
GLRO(dl_platform) to NULL.
|
|
* sysdeps/x86_64/Makefile (tests): Add tst-platform-1.
|
|
(modules-names): Add tst-platformmod-1 and
|
|
x86_64/tst-platformmod-2.
|
|
(CFLAGS-tst-platform-1.c): New.
|
|
(CFLAGS-tst-platformmod-1.c): Likewise.
|
|
(CFLAGS-tst-platformmod-2.c): Likewise.
|
|
(LDFLAGS-tst-platformmod-2.so): Likewise.
|
|
($(objpfx)tst-platform-1): Likewise.
|
|
($(objpfx)tst-platform-1.out): Likewise.
|
|
(tst-platform-1-ENV): Likewise.
|
|
($(objpfx)x86_64/tst-platformmod-2.os): Likewise.
|
|
* sysdeps/x86_64/tst-platform-1.c: New file.
|
|
* sysdeps/x86_64/tst-platformmod-1.c: Likewise.
|
|
* sysdeps/x86_64/tst-platformmod-2.c: Likewise.
|
|
|
|
Index: glibc-2.26/sysdeps/x86/cpu-features.c
|
|
===================================================================
|
|
--- glibc-2.26.orig/sysdeps/x86/cpu-features.c
|
|
+++ glibc-2.26/sysdeps/x86/cpu-features.c
|
|
@@ -389,7 +389,6 @@ no_cpuid:
|
|
#endif
|
|
|
|
/* Reuse dl_platform, dl_hwcap and dl_hwcap_mask for x86. */
|
|
- GLRO(dl_platform) = NULL;
|
|
#if !HAVE_TUNABLES && defined SHARED
|
|
/* The glibc.tune.hwcap_mask tunable is initialized already, so no need to do
|
|
this. */
|
|
@@ -400,13 +399,15 @@ no_cpuid:
|
|
GLRO(dl_hwcap) = HWCAP_X86_64;
|
|
if (cpu_features->kind == arch_kind_intel)
|
|
{
|
|
+ const char *platform = NULL;
|
|
+
|
|
if (CPU_FEATURES_ARCH_P (cpu_features, AVX512F_Usable)
|
|
&& CPU_FEATURES_CPU_P (cpu_features, AVX512CD))
|
|
{
|
|
if (CPU_FEATURES_CPU_P (cpu_features, AVX512ER))
|
|
{
|
|
if (CPU_FEATURES_CPU_P (cpu_features, AVX512PF))
|
|
- GLRO(dl_platform) = "xeon_phi";
|
|
+ platform = "xeon_phi";
|
|
}
|
|
else
|
|
{
|
|
@@ -417,7 +418,7 @@ no_cpuid:
|
|
}
|
|
}
|
|
|
|
- if (GLRO(dl_platform) == NULL
|
|
+ if (platform == NULL
|
|
&& CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)
|
|
&& CPU_FEATURES_ARCH_P (cpu_features, FMA_Usable)
|
|
&& CPU_FEATURES_CPU_P (cpu_features, BMI1)
|
|
@@ -425,7 +426,10 @@ no_cpuid:
|
|
&& CPU_FEATURES_CPU_P (cpu_features, LZCNT)
|
|
&& CPU_FEATURES_CPU_P (cpu_features, MOVBE)
|
|
&& CPU_FEATURES_CPU_P (cpu_features, POPCNT))
|
|
- GLRO(dl_platform) = "haswell";
|
|
+ platform = "haswell";
|
|
+
|
|
+ if (platform != NULL)
|
|
+ GLRO(dl_platform) = platform;
|
|
}
|
|
#else
|
|
GLRO(dl_hwcap) = 0;
|
|
Index: glibc-2.26/sysdeps/x86_64/Makefile
|
|
===================================================================
|
|
--- glibc-2.26.orig/sysdeps/x86_64/Makefile
|
|
+++ glibc-2.26/sysdeps/x86_64/Makefile
|
|
@@ -62,6 +62,21 @@ endif
|
|
|
|
$(objpfx)tst-x86_64-1: $(objpfx)x86_64/tst-x86_64mod-1.so
|
|
|
|
+ifneq (no,$(have-tunables))
|
|
+tests += tst-platform-1
|
|
+modules-names += tst-platformmod-1 x86_64/tst-platformmod-2
|
|
+CFLAGS-tst-platform-1.c = -mno-avx
|
|
+CFLAGS-tst-platformmod-1.c = -mno-avx
|
|
+CFLAGS-tst-platformmod-2.c = -mno-avx
|
|
+LDFLAGS-tst-platformmod-2.so = -Wl,-soname,tst-platformmod-2.so
|
|
+$(objpfx)tst-platform-1: $(objpfx)tst-platformmod-1.so
|
|
+$(objpfx)tst-platform-1.out: $(objpfx)x86_64/tst-platformmod-2.so
|
|
+# Turn off AVX512F_Usable and AVX2_Usable so that GLRO(dl_platform) is
|
|
+# always set to x86_64.
|
|
+tst-platform-1-ENV = LD_PRELOAD=$(objpfx)\$$PLATFORM/tst-platformmod-2.so \
|
|
+ GLIBC_TUNABLES=glibc.tune.hwcaps=-AVX512F_Usable,-AVX2_Usable
|
|
+endif
|
|
+
|
|
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 \
|
|
@@ -143,3 +158,8 @@ do-tests-clean common-mostlyclean: tst-x
|
|
.PHONY: tst-x86_64-1-clean
|
|
tst-x86_64-1-clean:
|
|
-rm -rf $(objpfx)x86_64
|
|
+
|
|
+$(objpfx)x86_64/tst-platformmod-2.os: $(objpfx)tst-platformmod-2.os
|
|
+ $(make-target-directory)
|
|
+ rm -f $@
|
|
+ ln $< $@
|
|
Index: glibc-2.26/sysdeps/x86_64/tst-platform-1.c
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.26/sysdeps/x86_64/tst-platform-1.c
|
|
@@ -0,0 +1,29 @@
|
|
+/* Test PRELOAD with $PLATFORM.
|
|
+ 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/>. */
|
|
+
|
|
+#include <stdlib.h>
|
|
+
|
|
+extern int preload (void);
|
|
+
|
|
+static int
|
|
+do_test (void)
|
|
+{
|
|
+ return preload () == 0x1234 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
+}
|
|
+
|
|
+#include <support/test-driver.c>
|
|
Index: glibc-2.26/sysdeps/x86_64/tst-platformmod-1.c
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.26/sysdeps/x86_64/tst-platformmod-1.c
|
|
@@ -0,0 +1,23 @@
|
|
+/* Test PRELOAD with $PLATFORM.
|
|
+ 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/>. */
|
|
+
|
|
+int
|
|
+preload (void)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
Index: glibc-2.26/sysdeps/x86_64/tst-platformmod-2.c
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.26/sysdeps/x86_64/tst-platformmod-2.c
|
|
@@ -0,0 +1,23 @@
|
|
+/* Test PRELOAD with $PLATFORM.
|
|
+ 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/>. */
|
|
+
|
|
+int
|
|
+preload (void)
|
|
+{
|
|
+ return 0x1234;
|
|
+}
|