summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-10-10 19:52:07 +0000
committerMike Frysinger <vapier@gentoo.org>2007-10-10 19:52:07 +0000
commit29efb4eb42e060e8c3b7e3b135d9965a13af0291 (patch)
treef6c2d97b6b37b34590e5e135d56c489c78f6cb6d /sys-libs
parentlast-rite gfontview (diff)
downloadgentoo-2-29efb4eb42e060e8c3b7e3b135d9965a13af0291.tar.gz
gentoo-2-29efb4eb42e060e8c3b7e3b135d9965a13af0291.tar.bz2
gentoo-2-29efb4eb42e060e8c3b7e3b135d9965a13af0291.zip
Add default -march for x86 on amd64 builds based on CHOST #185404.
(Portage version: 2.1.3.12)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog5
-rw-r--r--sys-libs/glibc/files/eblits/common.eblit9
2 files changed, 12 insertions, 2 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 68415c536a21..cb4ae37d1d72 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.552 2007/10/07 03:43:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.553 2007/10/10 19:52:06 vapier Exp $
+
+ 10 Oct 2007; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
+ Add default -march for x86 on amd64 builds based on CHOST #185404.
07 Oct 2007; Mike Frysinger <vapier@gentoo.org>
files/eblits/src_unpack.eblit:
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 8356095376e6..be1a05376443 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.3 2007/10/07 03:18:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.4 2007/10/10 19:52:07 vapier Exp $
# We need to be able to set alternative headers for
# compiling for non-native platform
@@ -80,6 +80,13 @@ setup_flags() {
amd64)
# Punt this when amd64's 2004.3 is removed
CFLAGS_x86="-m32"
+
+ # -march needed for #185404
+ if ! echo "" | $(tc-getCC) -m32 -E -dD - | grep -qs __i686__ ; then
+ filter-flags '-march=*'
+ local t=${CTARGET_OPT:-${CTARGET}}
+ export CFLAGS_x86="${CFLAGS_x86} -march=${t%%-*}"
+ fi
;;
ppc)
append-flags "-freorder-blocks"