[gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: common.eblit

[Mike Frysinger (vapier)]

vapier      07/10/10 19:52:07

  Modified:             common.eblit
  Log:
  Add default -march for x86 on amd64 builds based on CHOST #185404.
  (Portage version: 2.1.3.12)

Revision  Changes    Path
1.4                  sys-libs/glibc/files/eblits/common.eblit

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?r1=1.3&r2=1.4

Index: common.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- common.eblit	7 Oct 2007 03:18:51 -0000	1.3
+++ common.eblit	10 Oct 2007 19:52:07 -0000	1.4
@@ -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 @@
 		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"



-- 
gentoo-commits@g.o mailing list