summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2019-02-27 13:21:46 -0800
committerH.J. Lu <hjl.tools@gmail.com>2019-02-27 13:21:55 -0800
commit92ad88fe72194ccb72a5f34fa3c76078bfc89400 (patch)
tree0efb813db9d768886d738866816bc716bbb604aa
parentpowerpc: Fix linknamespace introduced by 4d8015639a75 (diff)
downloadglibc-92ad88fe72194ccb72a5f34fa3c76078bfc89400.tar.gz
glibc-92ad88fe72194ccb72a5f34fa3c76078bfc89400.tar.bz2
glibc-92ad88fe72194ccb72a5f34fa3c76078bfc89400.zip
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. Reviewed-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac1
-rw-r--r--elf/Makefile2
4 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 902ae1b84e..ed05044fe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-02-27 H.J. Lu <hongjiu.lu@intel.com>
+
+ * configure.ac (have-ifunc): New LIBC_CONFIG_VAR.
+ * configure: Regenerated.
+ * elf/Makefile: Run IFUNC tests if binutils supports IFUNC.
+
2019-02-27 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/powerpc/powerpc32/power4/multiarch/wcscpy.c: Define ifunc
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 \