[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

[Sergei Trofimovich]

commit:     2094540085135ecf4ec79d9cd9bb2df598d8083b
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 12:37:04 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 12:37:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20945400

sys-libs/glibc: enable IFUNC support only on whitelisted ARCHes, bug #641216

Apply commit ac450135f29ef850303589af998373d936955476 to -9999 as well.
("sys-libs/glibc: enable IFUNC support only on whitelisted ARCHes, bug #641216")

Reported-by: Émeric Maschino
Bug: https://sourceware.org/PR22634
Closes: https://bugs.gentoo.org/641216
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-libs/glibc/glibc-9999.ebuild | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 68d17a22469..a5bf3b51ebc 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -342,6 +342,17 @@ glibc_do_configure() {
        esac
        myconf+=( --enable-stackguard-randomization )
 
+       # Keep a whitelist of targets supporing IFUNC. glibc's ./configure
+       # is not robust enough to detect proper support:
+       #    https://bugs.gentoo.org/641216
+       #    https://sourceware.org/PR22634#c0
+       case $(tc-arch ${CTARGET}) in
+               # Keep whitelist of targets where autodetection mostly works.
+               amd64|x86|sparc|ppc|ppc64|arm|arm64|s390) ;;
+               # Blacklist everywhere else
+               *) myconf+=( libc_cv_ld_gnu_indirect_function=no ) ;;
+       esac
+
        [[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
 
        myconf+=( --enable-kernel=${NPTL_KERN_VER} )