Add default -march for x86 on amd64 builds based on CHOST #185404.

Package-Manager: portage-2.1.3.12

3 files changed, 23 insertions, 13 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/Manifest b/sys-libs/glibc/Manifest
index 420095bd7dae..287cae24d326 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -413,10 +413,10 @@ AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292af
 MD5 cebca9f412d4c393f32f9cca68575a5f files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674
 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674
 SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf files/2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674
-AUX eblits/common.eblit 6925 RMD160 aa5ec0ec7838e95567fc016b91007af04baef8af SHA1 db2e8da7209a382996b84f402f98328a30dfe7cc SHA256 aa63c581b0040d1157af915859ff534a92a31631d37715c9ab06375edfa626e0
-MD5 435110c649fac2470ffda46172dd4fa5 files/eblits/common.eblit 6925
-RMD160 aa5ec0ec7838e95567fc016b91007af04baef8af files/eblits/common.eblit 6925
-SHA256 aa63c581b0040d1157af915859ff534a92a31631d37715c9ab06375edfa626e0 files/eblits/common.eblit 6925
+AUX eblits/common.eblit 7155 RMD160 f8b7d8a0d4056b89ba77b996bfa16ba58051091d SHA1 faa2ec204833d489238dc2d7af7c02eddb07044e SHA256 c0a3fddd148ccd08fe2b7c32d079bcaf2213f5f492aea319a6d30f92a9a45e6a
+MD5 c4e0b0938e2d49dcaec4ab8d2c67ad06 files/eblits/common.eblit 7155
+RMD160 f8b7d8a0d4056b89ba77b996bfa16ba58051091d files/eblits/common.eblit 7155
+SHA256 c0a3fddd148ccd08fe2b7c32d079bcaf2213f5f492aea319a6d30f92a9a45e6a files/eblits/common.eblit 7155
 AUX eblits/src_compile.eblit 5096 RMD160 74e71857dcbf538349771437cd08b01f6b277087 SHA1 8b2b2f86a27e3ee6096baf5b673665feb1c7629f SHA256 fef68741aa40cd42f85fe39a3b33291122565a26894aaa0a0404f7d4d552049b
 MD5 4891968e3cff1e9ad5b22fbc7abc2111 files/eblits/src_compile.eblit 5096
 RMD160 74e71857dcbf538349771437cd08b01f6b277087 files/eblits/src_compile.eblit 5096
@@ -568,10 +568,10 @@ EBUILD glibc-2.6.ebuild 39505 RMD160 3f35b31a13ca8d31edf0da96656037e508598952 SH
 MD5 ee1117c5ccbe92814ac6cd5586c541e6 glibc-2.6.ebuild 39505
 RMD160 3f35b31a13ca8d31edf0da96656037e508598952 glibc-2.6.ebuild 39505
 SHA256 24e3558f82c2dae463f2d42949877bc22ad2689ba05bac1077710fe0714f4e1a glibc-2.6.ebuild 39505
-MISC ChangeLog 105583 RMD160 6354d04ad8a5520587f7a55e2d869903cfb185d0 SHA1 e91b4fa21b19279beac8f19aa37830674a4f0e0c SHA256 98f93a0ebd2e969017f2051c5dd6da4f50c45e4831fc50b725391d560fde45e3
-MD5 36e62bcdd863e621aa47d0883aceb903 ChangeLog 105583
-RMD160 6354d04ad8a5520587f7a55e2d869903cfb185d0 ChangeLog 105583
-SHA256 98f93a0ebd2e969017f2051c5dd6da4f50c45e4831fc50b725391d560fde45e3 ChangeLog 105583
+MISC ChangeLog 105730 RMD160 5edeab2804d28c3e02a2e2ed5eb0d3cb546f4156 SHA1 b34a4a8567e9c7572909ff74fd299a734bec02b5 SHA256 7a3bb662a8056aaaa754d9386724eaabd082de9cbcaeb11a5c12231808c43f97
+MD5 9de5054d95f51986033b025441d27e07 ChangeLog 105730
+RMD160 5edeab2804d28c3e02a2e2ed5eb0d3cb546f4156 ChangeLog 105730
+SHA256 7a3bb662a8056aaaa754d9386724eaabd082de9cbcaeb11a5c12231808c43f97 ChangeLog 105730
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -615,7 +615,7 @@ SHA256 2419cc2d213b8e7d1b10750a28497b95829771603d40e334894096003bfb6288 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHCFX9p/wUKkr7RBoRAnn5AKCdXmuuz8Pt1IO4VKKCqk52JiWSKACgrMV0
-QJO/uC/1UYBrsgg9sIikIX8=
-=fJRc
+iD8DBQFHDS0gp/wUKkr7RBoRAmZAAJwOEbegtPTkeRzzT1JYy+M42Z83qQCfUCg+
+dJLdIsscWvituZeykavmJ9Y=
+=vu6+
 -----END PGP SIGNATURE-----
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"