This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] elf/Makefile: Run IFUNC tests if binutils supports IFUNC
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: libc-alpha at sourceware dot org
- Date: Wed, 20 Feb 2019 08:29:03 -0800
- Subject: [PATCH] elf/Makefile: Run IFUNC tests if binutils supports IFUNC
We should run IFUNC tests with --disable-multi-arch if the toolchain
supports IFUNCs. For correctness, --disable-multi-arch must not
remove IFUNC support from the loader.
Tested on x86-64, x32 and i686 with and without --disable-multi-arch.
* configure.ac (have-ifunc): New LIBC_CONFIG_VAR.
* configure: Regenerated.
* elf/Makefile: Run IFUNC tests if binutils supports IFUNC.
---
configure | 2 ++
configure.ac | 1 +
elf/Makefile | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 2643db9fb7..c773c487b5 100755
--- a/configure
+++ b/configure
@@ -6794,6 +6794,8 @@ if test x"$libc_cv_ld_gnu_indirect_function" = xyes; then
$as_echo "#define HAVE_IFUNC 1" >>confdefs.h
fi
+config_vars="$config_vars
+have-ifunc = $libc_cv_ld_gnu_indirect_function"
if test x"$libc_cv_gcc_indirect_function" = xyes; then
$as_echo "#define HAVE_GCC_IFUNC 1" >>confdefs.h
diff --git a/configure.ac b/configure.ac
index ad50e290d4..598ba6c4ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1804,6 +1804,7 @@ AC_SUBST(libc_cv_gcc_unwind_find_fde)
if test x"$libc_cv_ld_gnu_indirect_function" = xyes; then
AC_DEFINE(HAVE_IFUNC)
fi
+LIBC_CONFIG_VAR([have-ifunc], [$libc_cv_ld_gnu_indirect_function])
if test x"$libc_cv_gcc_indirect_function" = xyes; then
AC_DEFINE(HAVE_GCC_IFUNC)
diff --git a/elf/Makefile b/elf/Makefile
index faec577d1c..e44960e5fe 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -321,7 +321,7 @@ modules-names-nobuild := filtmod1
tests += $(tests-static)
-ifneq (no,$(multi-arch))
+ifeq (yes,$(have-ifunc))
tests-ifuncstatic := ifuncmain1static ifuncmain1picstatic \
ifuncmain2static ifuncmain2picstatic \
ifuncmain4static ifuncmain4picstatic \
--
2.20.1