summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-03-10 07:35:38 +0000
committerMike Frysinger <vapier@gentoo.org>2011-03-10 07:35:38 +0000
commit6584b4b6728c9f9918acb89a69e9532331fc7521 (patch)
tree43a1eeadf774e8de601303479e639d8d0b4bb3ef /sys-libs/glibc
parent[bump] virtual/perl-Digest-SHA-5.610.0 (diff)
downloadhistorical-6584b4b6728c9f9918acb89a69e9532331fc7521.tar.gz
historical-6584b4b6728c9f9918acb89a69e9532331fc7521.tar.bz2
historical-6584b4b6728c9f9918acb89a69e9532331fc7521.zip
Handle "default" ABI for sparc64 targets without falling back to a sparc32 CTARGET.
Diffstat (limited to 'sys-libs/glibc')
-rw-r--r--sys-libs/glibc/ChangeLog6
-rw-r--r--sys-libs/glibc/files/eblits/common.eblit7
2 files changed, 9 insertions, 4 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 7135111112a4..d5c4cdccc592 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.755 2011/03/10 06:50:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.756 2011/03/10 07:35:38 vapier Exp $
+
+ 10 Mar 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
+ Handle "default" ABI for sparc64 targets without falling back to a sparc32
+ CTARGET.
10 Mar 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
Drop old sparc64 tls test #340773 by Alex Buell.
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 584a72a0f389..b2472e162218 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.14 2011/03/10 06:50:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.15 2011/03/10 07:35:38 vapier Exp $
# We need to be able to set alternative headers for
# compiling for non-native platform
@@ -107,8 +107,9 @@ setup_flags() {
# - UltraSPARC T2 (niagara2) support requires >= glibc 2.7
if is_crosscompile || [[ ${PROFILE_ARCH} == "sparc64" ]] || { has_multilib_profile && ! tc-is-cross-compiler; } ; then
- case ${ABI} in
- sparc64)
+ case ${ABI}:${CTARGET} in
+ sparc64:*|\
+ default:sparc64*)
filter-flags -Wa,-xarch -Wa,-A
if is-flagq "-mcpu=niagara2" && [[ ${GLIBCMAJOR}.${GLIBCMINOR} > 2.7 ]] ; then