Fix -march setting when building x86 multilib on x86_64 #528708 by devsk. Also note some future work related to bootstrapping here.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 35 insertions, 18 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 1f21a17c157b..025a34a69890 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1054 2015/05/27 14:02:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.1055 2015/05/30 04:30:58 vapier Exp $
+
+  30 May 2015; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit:
+  Fix -march setting when building x86 multilib on x86_64 #528708 by devsk. Also
+  note some future work related to bootstrapping here.
 
   27 May 2015; Mike Frysinger <vapier@gentoo.org>
   files/eblits/pkg_pretend.eblit, files/eblits/pkg_setup.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 98e490ad23d9..f004f089d471 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -15,7 +15,7 @@ AUX 2.20/glibc-2.20-gentoo-chk_fail.c 8978 SHA256 f9cc426b0fb21de1dc11bb36e43bca
 AUX 2.20/glibc-2.20-gentoo-stack_chk_fail.c 55 SHA256 ec73e74297b5eade591bfb3a2999989e2a7aa80752140048ffa67349635f05e7 SHA512 4dfec1bd17007b826110dcb73d09331a58b7a892c87de55b94480b14c28686442c567725b610082813411cf9911e180835a400a54ea704fe80f81cfba966a989 WHIRLPOOL b2b338a50f7895c530a71a19e4582bd0116a0b9d13b2e1505f0566924557493849f93cefb2c0ad1719ef684321e145129e0f72cfc9aa85a44ea7ebf910e7304c
 AUX 2.20/glibc-2.20-hardened-inittls-nosysenter.patch 9951 SHA256 992fb70b9b62674d94ef8938297a3f2591b3121495987d927f5a44c1d8788658 SHA512 a8302ee2963bd791be859233223b17cd154afbf04c13c046956bb1140d748272d7bcb3a6167ce8b61573ebcffe906dff064308374d2910656b8fad18480fe422 WHIRLPOOL b8753d6f1301650b91b5cf4f342de22010d819deb2bf4da27aac33d7540e15a140b8a7a4c5e111faba320873ed5784b22f6add29181fbaef14c3e9504b1b838f
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a SHA512 360b77df2d19d14060e19e763878297bf042eccd5206ce4829a33c78c982b59b46144116d237a7cac73a22dd6cb4987c8dd50f1d16003baa22c2cb2942d2cbdf WHIRLPOOL 44e14dacdd258c46201a44c2c6aae4d975b960a914c24e49f2b39dae960636512049daa052d3cd8e8d93819d263327c28eac947efdb5d9e240d1bc6e9964016f
-AUX eblits/common.eblit 10757 SHA256 215864e0d2cf57239efab1fd903b4410892698651b4d8c7e0a2fbcc09da8a5e6 SHA512 bc08d1cf6ac17dd526bfeb175fcc1079389ee53901e892c39688381bba8bbcc69516ae92becf170f75f816e246e59bbed1aba9d327f1069a2ab7f9c9fb265c2c WHIRLPOOL 276d2d477616427d124b41160c4692af7242dc7fb172c1b5ea8cf65a868f69122193a6ec2a6f842b67aca0c9fd9aacbf9b0f88436f0c5f00434e5f89554351db
+AUX eblits/common.eblit 11538 SHA256 0946ae0fbbd42524f326241af4b79a1c572fdeef98706e6ad7db17798aa2ecdb SHA512 aefbbe01cabc0f9bf63a68d3d9cc61cfdcdc798f4f991f4b446807faca34acd7d395d97ac9a4fc221d6eacf487755169b3a6d30e3f529d408efbb17606a45988 WHIRLPOOL bda9c0e1f4789dbf0ac9839e8d3001ddce3fe6877af9217f8a0028eaaa15f7912090fc3e4c394c9f05d629040dcc3bf9cd6517d0e9de5642fd22c52b477ea03b
 AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180 SHA512 b491761a0923b779535b4a5abf6e00efb6f2c0bbb68e7fb01b2cad54034b63ddfa271afce16b17b17b53ac809ed869c55f94c44443d661052779770f4302318b WHIRLPOOL 8e3a3f35a4cefa903bc578d2fb6b22506f3ac94939f9ad1e703f470b13ba0fd3353061e38e3142ecb5c693749c84d4a1e4f4a5920e36ce20dc2f7e3b6b67ed9f
 AUX eblits/pkg_preinst.eblit 2040 SHA256 1620ad612784692b5a55ecccb6c8338d3aee771a9eb771e9a25c15198ebe9f4d SHA512 7eca185f214b83e3d36735f998dd29d9111c9a71b97152d4d69e99d7ab1634d1e2d70eff35ef036fc0036be9b48db4c3b2cee9dc6bfd1cca6e7cc302ce6e31fb WHIRLPOOL 03cc8613566c6717e211ba0305cb71d8377051f07218b64221e5376e2d603c9bd110e601acf62ddd25c70b887c308858ff97e53ba97708d4e6278db063a541f3
 AUX eblits/pkg_pretend.eblit 5103 SHA256 36fb5e7c27e0ba40abe096f9c53be352706b264d4409207252b019e45d235e31 SHA512 a508fed0c9fb8b011604687ecc4360ebcce8f2108f32f63c6fd852f35ca1d9185f6311c114d09376f4ad06af498f9c24791a7a4a5a0382b5dbe717975fc2009c WHIRLPOOL 600fc239333f854abeb7b7dec08a2d7222ac4c1bfe7f2a0db48f6e172dc25cc7080b0b232ad1421fbefbd445d38ce9631de6a601f211e6644dcbf4f81972f85a
@@ -69,23 +69,23 @@ EBUILD glibc-2.20-r2.ebuild 6466 SHA256 4bd9a1293e64242620dae13cbffcb218547b1b80
 EBUILD glibc-2.20.ebuild 6167 SHA256 a0e72107a083c87ebf91a8c0c43ef4a2086d468e8c3ab235e1784fa9ea36ab3c SHA512 32e2729ff56ff45991de497727409dc633c855eb8ee4aed30a20448257605671c18d1d13e3aa09e07e129bd6a767f7ccd33fb9782cc15f71ee89cfb53851ce56 WHIRLPOOL 0783333312b9ed782d046a814b67514826cfd3ebe2019b0e73bdd322cb695ec875effa99e7be123f4e7fa78f6e2948076ca48a9c4b36910a43c586f070e10771
 EBUILD glibc-2.21.ebuild 6451 SHA256 99c06589652a6ef696d0c12f685fd9eb8525441f4118afe1847e9b9a58941da9 SHA512 35a2f21d3f6a5cbbe82efd7c2315aeb5044130bc363bb2da460abe2457c0ca74b6f0b4828cdc26cd38f40e7dabee69ee104cc3a78173f52f1001036702a2f38a WHIRLPOOL c8bb1b86cad8ce316736249c81cbfeba4a6131b2e8b257f373873f450e3a8c36c6f7ba36dc09a9ae23aca31cd47e0c1d04b27fb937fe3a86a7bb62eaaf8abd09
 EBUILD glibc-9999.ebuild 6196 SHA256 4424928f8e681c2d87d15eddd55e9f083171a9ee398e467eb71ef10818fe5394 SHA512 8e6969eb56569045a22f8a048f29fb91692bb18312b3c8e56781c952b0c68e3c082964f7ab7943505e47214dd282f66da1cf524b7898532e7f8bf55744a1b036 WHIRLPOOL 780f2272244eb78ab48bc5cb25db5b5ced4a791a2c5a184e5f627285bb960f2f13b360297703499aeaab85243866e6dc8b5c3c0870a58b5229e4d8de765d65ce
-MISC ChangeLog 76228 SHA256 759a661565fbafb46d77cfeb60c76442220c912901e8cf0c6fc520ac96aa3da6 SHA512 8f1c3b6c9cccaf92a6543595f007702b068483c4b51814819e93c0ad49d6e9e007486a0041de7d7ff8b24dd3e2f6253dd68608a8d066013d8ad797b2f1e8e86a WHIRLPOOL 03113b700a88190ac68f78c645e05dc751ba1c6edd866f7d1a3dc45c5fd39c03ab6512873d897887b59d323da628b0ee337434c0b5f82b64ff99d34c560b58f5
+MISC ChangeLog 76442 SHA256 cadb73a403117fc1c98c915cf883feaf887ceecd40d91985ef93978b2e8e9503 SHA512 80d17d834e3b80584e845ff45f7d163e41a572ca14be12ca87a78cff9582c516b234cc675bf24f3c9a1c335dbaa5cc432a5799c467d7d13a2327b97aaeaf4c96 WHIRLPOOL 92a3b58db5df08b6128f7ccd8292886c28afd7a29ce2cf91806fc71f15f4f67bd4e4ea90e5f89a0bb0e69cd70ffc97dd2984644f948167350b4f67b4d2cd2c9a
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 724 SHA256 b9d8df62b36ae314b29a3177c534495036ef97a819c152247383e907004fe4dc SHA512 8c215338bbf47de95f40f9f24c50d107ec0bbe4a47282d3cbc253d4003db85a88c542aee33756dd9d2d2ec4c70992009261d821a8c145c24c24d2ad448595b77 WHIRLPOOL 954f5d080c7219ffe85e128eddd05c74a32a457219d423441bb58d54a7de1786da6a2efb541861b3bfc93a9acf2ae6f79168d1ccc37385f84af0eb439fff2954
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVZc6TAAoJEPGu1DbS6WIAO/8P/RL3yNDbSL7564Irex1nLhis
-ja4HPMewKc2WRCUd9Bac1WV1TJgaN+AGF2aF6n8I/8Npk+ZRDVRrtSoqu0tqQPfZ
-+SQc4tnlQfdkb784h5uXFf3/duSYIsw+SYQfIIr2ov8Uc1oCSuHi/Jl97E38IJS6
-17p+KJ+29OyzaAH14ZhSYG8DueEj/w0Ya280gVVICI5jsRl94QGdeBafoQLSC86W
-7MHcnTk+N3cI5RemaSwXeDPs6E96dhZXqFf/VPptcSMKY6E1dLAnqkvoGbwb18wD
-m1eth4x8sSo4xZ3pHJNwEXtGY9I9yXXMLGTQGCbv2IEsZqyM78PvA76+O0EQD16V
-egjo5J+qKOmo9+oFX0PLAJNiRAilmYwP5cL0JE0nJClFRQGzOJ6Gmr9p9vBOGIPE
-nJxJ4YYMbzl6+IwbzBv4CQlL31W6ijj2GeUj+y2L5Fh6eMEy73d3xJE8+t3fHjT5
-T8tft3udqvJon1DA7Kqx7JqdLTdebsgVVzfGj7OPWUlfLIQe4PeDeeU/zityB/JK
-uPu5XN8CiqBt91bzcmW/TGiBtX8nZEyxnk4HWypSTykaeoyx+Z71I76E5V/YiIR8
-GonxYgTFgy7JWwDYoT71UtZo+3SyFGd1BwA/qbGJ2DqiTH8kL1SFdPuSm6h68Dg+
-AcJUKcKGQUjN+0HZcn4X
-=CIlC
+iQIcBAEBCAAGBQJVaT0DAAoJEPGu1DbS6WIAMSMP/iGTIdrxaNnt3Nc+OO+qwfWd
+7tlqB6axMAWdQeH3GeKLRQhGEYmoQ3QyZn/qjqlxNfhrDLqQCuo2z7OGpo0Zp7+u
+0xIYqAqfZaG1Szq1vXVnfsobQWIQtU7GWKS7XUE+lcDfgjFQNyqnMpfrGWnF80sV
+IbMJC4LRecj1asw3+TcRa7Ijd9Up85qIo6fr+jKHmvcTNpFkVe7lTw8haWF6h5K+
+kBS9HyZ8r4EvarU65TKi/B6geEdnhV/q6c3/BIDg3xBSjIoP103XBNUMvJb1PLE0
+SgePy8W4ONAVn7Xwyxbqb7S2wymmxHaCcd2wjskFvWoiyRlcOy/uR7QhdGxqD9bR
+tH1aChBW4L5/eXh8gEvHFgZyW4PlGvyE5DwpN2jRCxsujqqg0UimSFfEJEXZYXf7
+bmfXwIZkfsKOcwTREKpa2lX81vgpEDANzTzI+/3PhMd01anCuqlAmRVXnQ0pxUAq
+c9CaC/kb9cndCT48c5sXsYTGbP7PC/zKinQG8z2Fc0do/f612rkDeYl+EXREbmMC
+v7KbNgYJSuqnEmdQQMYqodO/nskdsPv8BOetZuFjdEfNody0IZ8wgzdevpmPVFEe
+RQXapmnCelLTi0SXit/qGuPjWz6Hp36s+0oH223cYO281u3Jc7xHq4g7KrDw4W5P
+e9TfsLAbxTBxaIJlOda8
+=YDhw
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index 2f7471ed3297..1dab165ccd07 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
+# Copyright 1999-2015 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.45 2014/10/18 23:09:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.46 2015/05/30 04:30:58 vapier Exp $
 
 alt_prefix() {
 	is_crosscompile && echo /usr/${CTARGET}
@@ -58,6 +58,13 @@ setup_target_flags() {
 	case $(tc-arch) in
 		x86)
 			# -march needed for #185404 #199334
+			# TODO: When creating the first glibc cross-compile, this test will
+			# always fail as it does a full link which in turn requires glibc.
+			# Probably also applies when changing multilib profile settings (e.g.
+			# enabling x86 when the profile was amd64-only previously).
+			# We could change main to _start and pass -nostdlib here so that we
+			# only test the gcc code compilation.  Or we could do a compile and
+			# then look for the symbol via scanelf.
 			if ! glibc_compile_test "" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
 				local t=${CTARGET_OPT:-${CTARGET}}
 				t=${t%%-*}
@@ -68,9 +75,15 @@ setup_target_flags() {
 		;;
 		amd64)
 			# -march needed for #185404 #199334
+			# Note: This test only matters when the x86 ABI is enabled, so we could
+			# optimize a bit and elide it.
+			# TODO: See cross-compile issues listed above for x86.
 			if ! glibc_compile_test "${CFLAGS_x86}" 'void f(int i, void *p) {if (__sync_fetch_and_add(&i, 1)) f(i, p);}\nint main(){return 0;}\n' 2>/dev/null ; then
 				local t=${CTARGET_OPT:-${CTARGET}}
 				t=${t%%-*}
+				# Normally the target is x86_64-xxx, so turn that into the -march that
+				# gcc actually accepts. #528708
+				[[ ${t} == "x86_64" ]] && t="x86-64"
 				filter-flags '-march=*'
 				# ugly, ugly, ugly.  ugly.
 				CFLAGS_x86=$(CFLAGS=${CFLAGS_x86} filter-flags '-march=*'; echo "${CFLAGS}")