From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 27 Feb 2019 21:21:46 +0000 (-0800)
Subject: elf/Makefile: Run IFUNC tests if binutils supports IFUNC
X-Git-Tag: upstream/2.30~317
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92ad88fe72194ccb72a5f34fa3c76078bfc89400;p=platform%2Fupstream%2Fglibc.git

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>
---

diff --git a/ChangeLog b/ChangeLog
index 902ae1b..ed05044 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 2643db9..c773c48 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 ad50e29..598ba6c 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 faec577..e44960e 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 \