summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-01-16 17:38:31 +0000
committerMike Frysinger <vapier@gentoo.org>2014-01-16 17:38:31 +0000
commitf12b27cc1fa35dab65217469c429641271606194 (patch)
treebb54366c557f4c60a061e031cecec9f657d21ce0 /sys-libs/glibc
parentMark m68k/s390/sh stable. (diff)
downloadgentoo-2-f12b27cc1fa35dab65217469c429641271606194.tar.gz
gentoo-2-f12b27cc1fa35dab65217469c429641271606194.tar.bz2
gentoo-2-f12b27cc1fa35dab65217469c429641271606194.zip
Require binutils-2.24+ for ifunc support on s390.
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-libs/glibc')
-rw-r--r--sys-libs/glibc/ChangeLog5
-rw-r--r--sys-libs/glibc/files/eblits/common.eblit5
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 58deb952b11a..4e3cf99f11fc 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.972 2014/01/16 07:46:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.973 2014/01/16 17:38:31 vapier Exp $
+
+ 16 Jan 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
+ Require binutils-2.24+ for ifunc support on s390.
16 Jan 2014; Mike Frysinger <vapier@gentoo.org> glibc-2.17.ebuild:
Mark ia64/s390 stable #496752.
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index ac6938411cd2..91df3f24546f 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.33 2014/01/10 15:18:19 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.34 2014/01/16 17:38:31 vapier Exp $
alt_prefix() {
is_crosscompile && echo /usr/${CTARGET}
@@ -256,7 +256,8 @@ use_multiarch() {
arm) nver="2.22" ;;
hppa) nver="2.23" ;;
ppc|ppc64) nver="2.20" ;;
- s390) nver="2.23" ;;
+ # ifunc was added in 2.23, but glibc also needs machinemode which is in 2.24.
+ s390) nver="2.24" ;;
sparc) nver="2.21" ;;
*) return 1 ;;
esac