Add support for in-place bootstrapping between ABIs (on x86 for now).

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

7 files changed, 83 insertions, 54 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index e69c9dae3e88..93f42f74e7b1 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.988 2014/03/25 00:34:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.989 2014/03/29 05:31:59 vapier Exp $
+
+  29 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+  files/eblits/src_compile.eblit, files/eblits/src_unpack.eblit,
+  glibc-2.17.ebuild, glibc-2.18-r1.ebuild, glibc-2.19.ebuild:
+  Add support for in-place bootstrapping between ABIs (on x86 for now).
 
   25 Mar 2014; Mike Frysinger <vapier@gentoo.org>
   files/eblits/src_install.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index b91f87e35d13..4e66765cfc55 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -25,14 +25,15 @@ AUX eblits/common.eblit 9918 SHA256 b0dc932bbf508654068082009c87aa383829185836b7
 AUX eblits/pkg_postinst.eblit 1081 SHA256 21c349d6999841b277dd00ed6f2bf4b33d14724510da3c15a99e775cb71bd180 SHA512 b491761a0923b779535b4a5abf6e00efb6f2c0bbb68e7fb01b2cad54034b63ddfa271afce16b17b17b53ac809ed869c55f94c44443d661052779770f4302318b WHIRLPOOL 8e3a3f35a4cefa903bc578d2fb6b22506f3ac94939f9ad1e703f470b13ba0fd3353061e38e3142ecb5c693749c84d4a1e4f4a5920e36ce20dc2f7e3b6b67ed9f
 AUX eblits/pkg_preinst.eblit 2288 SHA256 2c9a0580bf9924d30efb6683174849a9789cf428ceabf340ab8d592ac7c3d14d SHA512 0b946492981adc4d4d4ce8a40cec1f05537653ba5a6423fef3b1d058cfa4f21594635b13c509ee186e9202d54d502e9f61258706e37b55c0ee53a00772bcdb59 WHIRLPOOL 46866a1255eca622dc37c02eb32f4992b3eb90502599226a2ee5e2fc1ddcec4673162d6fe1f53a720e2d3b350a36b8b0d5bfef161bd815e0b335dc0b6fadfe27
 AUX eblits/pkg_setup.eblit 3898 SHA256 86b2ab461571912b948791558c37bccabfea6c5b7a08d1fdfe646b51d403b4ef SHA512 c1f8fe6e691c989aab11b2787b42398df0b372d267a10513772cd874c99ee07f3889bbeec86d7d944316b8804d94ebcd29831e29712ec14a062581aae3d58573 WHIRLPOOL 809b89b27400732715048a5fc3c17a4a14a6dbac2b2c256dab3680588dcdfd506c088a3992439fc71a0c40754803aaf62223ba81f6981b4b9b2fd20302e0af4c
-AUX eblits/src_compile.eblit 7005 SHA256 bc64131508df98fd852c35ee1aeaca3c27f2ccc0023e1a297c401706ee28ebc8 SHA512 f305ffbad5f5a64c2dfc6729e748895f15c9984c738cdafb49e955bcd2af990cffced030c8fc4e23470cc2eceac0468e8e13bf0c670725226e0bdeca15ef2154 WHIRLPOOL 7ecde1b6b9b7f9a691a7e905120c0806a9cc1a999329f65ce2477823fccb61059a0d7f9c9ae2bd6137e25d9e146806407bf320452ba85cab72f7517a369c5e04
+AUX eblits/src_compile.eblit 7648 SHA256 a47b9dd06dcda3446ca7ccb5fc1984968be0d74a6c7e7470d0ef409d6264a495 SHA512 1a43d37909b3740a468e0d38b1189bf704f451d23060f08d70232a56cf7463178430360c9624d344af46aa9ab56c608b21c8bbb4d19ee4b4fe1f60fe58e3397d WHIRLPOOL 636a26d9aeba37068aee2fe99b630e411a9cf0e0da89ed159388a0efb5720595da0d199b05ffba718aff0109255bdbe35fd55dc2f3bf8b6527d3d2069080ad4d
 AUX eblits/src_install.eblit 8789 SHA256 e57c29e9b0f8fdbb70ecb0b6cdb0cc1d896802121092e004153343280cbdfa25 SHA512 7de015b93e170a14baaf6423e65923b36221ae97b1e5345692551f22557160a2d637a28083e8e673a2c7850073ac1506aa615cf490b59526f11e276abe175292 WHIRLPOOL 90e4d43d83aa074a4a1a078daf1c615e5f92bc4e6b24ca0232b82adea64ff17c4dce1efea728da7b3092deb6a1daf1979440c5eecbfd919ba1b2e75ffcd3c37e
 AUX eblits/src_test.eblit 1278 SHA256 4cc565c9688292f1a195b4d9a5ba2d1b90ccc505e62229fc21d9fdf67d9655d5 SHA512 b058884a9ec43f047f10b6d61338366388dfb58c920e3f55baa85a9795750af7b8eafba427bb8ec59b1269853a4e4135b86a951f6513f64304461364b6f36a6f WHIRLPOOL 50b798092b0a9734767a8f9b7d3e1dc087d76e60f1dc83d6d5dde8aba48b992fb1b6eb6f07a9259b6fc4dac9bb391ab8972fd705be91ca15033d4d4144044e93
-AUX eblits/src_unpack.eblit 5179 SHA256 b60c5e4e7cad11ee4ffc4304e213cdb117baef1edfd6c22e805f31f1cafa8db2 SHA512 157e8a1a0c324eee0e3cbf5485c67e6d3abc598cc2e38a3fc94de6c875ad33383ca7124f63bfcb9884f575711fb3a641743a59ed41cf9fb57a818ce28f6da4a2 WHIRLPOOL 2649345dfa88b94c2de6f56d421175dd852c205014688399a2d2265dd01e5e06ef0d953d576b9559a70fe8c82d92fba4b8e2265cf37bcabea193542a387481f3
+AUX eblits/src_unpack.eblit 5200 SHA256 f945dcd835a1f623b107717d93039c941ff79dd56902a5c74fce97ac8354ed64 SHA512 d430da2df6f216bddd452551a28334e5b7dc66c6be56c7f306f1e09dafa728b7845fb50975a9e7930efefdfc3cb883d4bc99a259226ac29eeef05a91c942ef88 WHIRLPOOL f02b4d506afe34ff7c31f1d6d114e0c713c58e328dc697ad856c571d0ca06602788addc5a858448f8830557f28052c5956a05e26d217d737158143c823b200de
 AUX nscd 1621 SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 SHA512 3e1255ab014b3806112120000c3d2189a7c1c69dcd6639d5ce55e96bec721683a22b141982f6a6c6d44b14481c33fbbaa470863bef04e9b9eab7ccad1ddd5d95 WHIRLPOOL b7152f8d888fca13a16ea403c44eadbf1da2249dae3add11f73999259061824460a5479aa7e58c012bd737b62ecc81814109832cee33638279d90d4c08bfdbdc
 AUX nscd.service 337 SHA256 de7bc9946309d34f0ab44aa22a4d3cf259fe91c57e8000d741cb09ecd3a6caa0 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea WHIRLPOOL f01d191971b0dc45f541c9ebaaa1a40f3497e2cc838cff6a20a7b1828d726c248abbd94322a5a5ff30c33ddb7d9086cd4d2ba3bdc1811fed59ff292ef3983a72
 AUX nscd.tmpfilesd 111 SHA256 f0f64c4612d2097173854d2ec2e94ecbf4b77c7a6e94d950874e37346aa90d72 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340 WHIRLPOOL cf1fed1a7e2ac1623a84f1cfa2062645afe3f791da2f4ace3859d12aa05df0e282b4c2e367a460015956ac2a8d01fee4cda84917a3adf2c38561dff200335270
 AUX nsswitch.conf 503 SHA256 6c38b8642d5da884327ad678d0351d57be3621562253bd9711394bad87e45e2d SHA512 c13714110f3ccc9a2270f51d0da9293ab19b9df368092d19b1a84d5051d888297bd9439a322eca1ea60d6d5e58952797d803a368a295f2db6d5e97e173907373 WHIRLPOOL 0d37755ba5928ff894c355b3fdcf7079f19c1cb7a4f3676634084da89c74d7175823a4659b8c66d8dc1395d086991857162822ddf977dbe8dff9a59bccab821e
+DIST gcc-4.7.3-multilib-bootstrap.tar.bz2 6648989 SHA256 e25e64478c1409e44e9ff618b81caf8b8ab1a850c6130617984eea6228e4e5b7 SHA512 a24b5150716f4eed9b023588ab744435ff744b392f35f5ff0db4516720b78e55d33597593732eed3086a6a40f2a282ffa7f391e5e44afe138707e2b592ca125b WHIRLPOOL a3f3f358866876ddf0b28f51210a3052afe76fc42a3eaf151755dab54d6460202dab4b8faf2e6e988d3c622722849d3e35978e5e5b9e29531ea3927225866542
 DIST glibc-2.10.1-patches-7.tar.bz2 113612 SHA256 6c94493e08c13072c94c967f55b659e6c950ec470c9677c43cfab10e24a88370 SHA512 6f1d575273ee354e6b9fb85d1a25b660e52fc77ed50bbe0a2c25f60d4ad11ed4560b27358d1b7a5412d5f1fafac2dd83b7ce5b1420205ef2d4906e4c99b610ba WHIRLPOOL 70efe90ab258bf15cf6c0b2ec826aacf25d4cab0d0e09b8883ecfdc34bdc54072bcd3330dd622b8f12ee6a1c74928ecd022e844a351717b53397f056b376992a
 DIST glibc-2.10.1.tar.bz2 16106243 SHA256 cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667 SHA512 3933f69884862b38999b25af60b66c3d887bb022a26bf72e69ca17f2733e37017329d085b4ebca56dfad265906748b83535ccc41df034a867d76a62025c86df2 WHIRLPOOL afffcf139b78643822e6c89f6d6748161bd8c9043e5337d7b057fcedc4ba4e07572c6548c0288bd1bac10bdb63bf69c5eee1047750511ed814c150179ec34f8c
 DIST glibc-2.11.3-patches-3.tar.bz2 112513 SHA256 e3b3a256151d86fec9a2625f29ea1486a3e770a0df8e5a803f4914da50e582e7 SHA512 a6f980c91e4fa40ec466cabdc666ccdf78b017f16d2e454d6b3bdbdbe32ad4ae316b9f8f5865ea8f0aeb5081319793fa569029f5aca536f40ce82dc1df629b67 WHIRLPOOL 58b10e2aa5691ada1f504ca192329cef8ac0babb98d21bc54436c7b0218979703aa3f525611b8016a11dbf9551b3bc443e5a17c49481518709322c01fda0b5b1
@@ -86,28 +87,28 @@ EBUILD glibc-2.15-r1.ebuild 8151 SHA256 34ddd886973a6c5a6c30ff25ab321d8f725aac76
 EBUILD glibc-2.15-r2.ebuild 7700 SHA256 4229a5efdcb84fe6f8e6a07181a4947af3f708364ef5ec15ea4f30513b46edc3 SHA512 a6647319e78b43d437639c7b03a9f945f23169f1e2fca8b1e5de0e19e7737b321ba1256252de8385dee48b253498b54284021f113e5bff0836ce196b0172d1c3 WHIRLPOOL fcb1e5273b08749e9c98ed2e8e95873fc5a0728b650aa9e72f9706d438749c97c5efb48120ae71769477eafc25c0adb561925bb6d1c82038d674ea3c7cda3a3e
 EBUILD glibc-2.15-r3.ebuild 7704 SHA256 2f3f605fdc54b54d15a1c8ac7e46c97aa113866ce42ba0c04d821b7152eeac7d SHA512 6c1cd53c188036675dba652582e861288320e545f10e15872f40b5ed04ea513dbd57485b1f9404c43e45b2a3a9b2f21d822b6b6424cdaa14b9aa8bceb9617879 WHIRLPOOL 84d6dd64c38a58a52617239dfeaebd87ba87ef9ef9c5fdb317209285dad9d8fc683cd59c4c19595d08f0870238c6436cacae5ecd5089648a3dd9ad49a763e548
 EBUILD glibc-2.16.0.ebuild 7497 SHA256 89d495bde91815ce91eef584475eb421f685b80fe33436fb155f98b079d78daf SHA512 d2d008a4af3d63a88e404612d340550e2d5cfe0e2999322b608d616fbeef3881bb2d1a4889e5047fa3cdefcde64032836bb240c43f2b20438e5f789818c864f4 WHIRLPOOL 967a590b357b68fa19a67b1ef62a6978fc63e31fe535c940cccff60df36e925a523daa648a0af3fad94733c8a37c95f73889fd98f7bfdefdf3e7713da3723c26
-EBUILD glibc-2.17.ebuild 6711 SHA256 73cf767a5cb78319ef30bcc393d7a31c8b549e54eb56ab6946ec1b3abb5d17f8 SHA512 6f2a4a8b64efac2cfaebb15fd4fdf07da7f5b5e6876028401ca419554dcd7e248f232b07b06699b66713959ba63d0499c40bd40e4dc61e9959938171cc4d76fa WHIRLPOOL 00a05023ca675ab84c505551275563055956c7894fc716cf254ab7625c4c9107890273729777bf830601358c4f99b19e5d686e0a72301ff2ca20434487fe369e
-EBUILD glibc-2.18-r1.ebuild 6777 SHA256 e2baf89d859b5415d6ebcc8634423a4ce19d163b4259bd46a10adc2e7395de78 SHA512 d87e7d397a12c59e3f1b002242514fec7ccfd71969e6c954503933ba6aad5bf4352632f39293a9b9c813f89495c2e1bb3d319f83e6d5e66939be09d01fd17303 WHIRLPOOL e99985ca69aa621a14350f1210f0eb74cf4c2c9309c7ea80e29f541f8a0c82d66bc6e1ad67a08cc6add0cb42a678672d176f95618c3f9f42d2d99fc2c17605a6
-EBUILD glibc-2.19.ebuild 6641 SHA256 4d5585a4cbe6a048c4d540b20f3d1f4e3e51936f262532c9ae148c440b29dedd SHA512 98e09b8022b82646b1de08067096ac0e700d648b03c3a690cf84f2e34def93d653706d580d025e5c372361df0b06e35a72a58c2318213cd2a52d43a8988a3702 WHIRLPOOL d5a0266c6e29a82a2c16e185d2d404f80c4817acbed2486c3719fa150eea41f7860e64bdf56809feb4ed239b50852e248df4a56a22b91ea2e1f1148f1797e11c
+EBUILD glibc-2.17.ebuild 6940 SHA256 5860dc0a90835741af8be19fcd83d4d6d81b79e0e69cede54632c325d7e82b12 SHA512 2e950386fcfd9aeb5ea31e5e437efab356bf42838d1418e9839d115c67fe5e3f5d15b843abfd04e841fccb395550008feec7bbd1e9a2bd3adace15352d835d19 WHIRLPOOL 4ddb67c352fc91ee7cb7630a0223b0922f9a30b721563ac311c4923fcedb82ff5042f2c22b58d3ff2c12b9621cab71a8e522565b3041c66ef233f549b733d9b9
+EBUILD glibc-2.18-r1.ebuild 7003 SHA256 5b224a0b8f3e6df46c5712e676b05c88dafce3dbbb24cc46e8533fad39d712e5 SHA512 c041f954f03e7324591be5dee55909fb291cbb4a154e32a15237a7d4987a9bf232345ae19e0f2b143b449b1b8c58b48b028ffb651223ec4b7d4dbdece9ac1531 WHIRLPOOL c2a3cde5dcdd35bf4b37d8c49f49055b2ed1c3944e6bbb0657ddcd5c28b559ef14e3ac8b3391c10c68998165c5177d256d6bb9dd8cadd9f27a2cdd84dceba374
+EBUILD glibc-2.19.ebuild 6895 SHA256 ed56af849caa055835244779f9cb6bdb5165c230ff841b7528dbdc7045c06b97 SHA512 08c76998e9c486c98d2f816876857233e26a37f7f7396c76770e986482d68a54054cd0962cf4f1b0bde9a948bee11096ecb154dfdebfc7bd432ea7d35e51be5e WHIRLPOOL f868e82ac1a4f2aa75f1999150d822aa8896a06553a9e79d89197358fb831826fbb3c30dde82026b84c646ac09d81997c2de1dac3d52c5a68b4f0c3ebf6974ab
 EBUILD glibc-2.9_p20081201-r3.ebuild 6787 SHA256 3d9ff2b86df088b8e8cc082c5ddef164b48cffcccfa2ea001306e79a6d52a52c SHA512 7070020105a777bbf6d846fab291b238d7861472c737031e8c52b6d5c2a0524e228b724751325448ce94a42ee39112088b91d0597cd2cdbcc68c51248d2d5a11 WHIRLPOOL aa0e2d11377c3a30478afbef0fa3daa12aa9711d68dc92ab08fca999e599c613648644da2e6f81c38dc98192ed26934c4a35418a97d3146650cd4c82e39a7fed
 EBUILD glibc-9999.ebuild 6642 SHA256 3b491a44e39827796c4001d3627a332f8826807f3711f61d930a9cb48518c1d7 SHA512 083d0e295de87a72b1f3169f5a0ba1ef21a7d61b86b363568940157f4e8abba5ec65414847851ac39c14e94444fced48de8f2757c9a24d4885eb43da76ec1c0a WHIRLPOOL 20580e19f7e838a61d134e64a452f00dac010345367caff5d9a650e41d58338e0b7c304c2a7b8748101b51621755185b6ea5ef1c3d3f54e6e7220dce2b3ce1f1
-MISC ChangeLog 65552 SHA256 7752762983fb16acf3c084e7e8a201b61efc7482fb9be78aead86b45a477805d SHA512 3acac5d968795313d2b01311c333ba487f6d235ede27786d0d38c1556168b6344a225163a0155ba475fe04a72d5ace0c4e9cc71d930076682a313439fa39c0cb WHIRLPOOL 7d949a15c3ab3ca0f1d58d27c07d9bb4d01f74d0bff5c0233e39a24699e2686905f82e6ae5ac5fbc285b804dfd2296e374cb8705ba01ef4733ea784142c241b4
+MISC ChangeLog 65802 SHA256 ced783c70e172a8c01d69142a4cf4c309b62a6cc20b87761436f1d6d8f9e8e73 SHA512 f91e689ec642dc88d7d7cd0732bdc2b1dcad3b838761f2a28746f39cd0d9fa75d4c0723c712610bb4541b80c3808ed2da3fad773102e3af979a75b07ede7b903 WHIRLPOOL e116ed71e959922e678e1cc2e0543d5c24f43f1dd3c33178f96237f7dab4c909a7efef7ee242f9a3f29f72d6cf071243dd5e58ca31bd11b9d58bd3c94b61e1c1
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 521 SHA256 e89c6157189c7a76823ea61ad88e85d6c5e497855abfa03d4e044b09bd0d0955 SHA512 46d36653c75257e1091d88eed54dda553a81a246407f7ae37864e3a9f1c359560bf3d08f5946a725624804e74b1684414a729a1a3b961220dc76cdedd9a4d0ce WHIRLPOOL eb3695d1ce708f3668dc85332b4ad9de6e021b3a98c1b48c4b874d7254168ee5aff2ac6b51866b1df29f1689085ab07e97a7b39708bcffbafedb21288e01f42e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTMM83AAoJEPGu1DbS6WIAg3kP/j1L0bWJ8qsy50tAqwTNZ+aB
-V11UY3y3O4wx83kR3EbEl84ZRatkUBwlHrcZszuVLS19ssSpV7mdF5J1oYT6+nFd
-FYJoriVIUy6JgijX6BpAdA+2wLrt7Q6cq4bmvvdzc+oOV8ETk6Sf1nJHjRMYCxZO
-wzspswuvoNbuSNgopvz3B/uw+/TxC9ZRe6HLEWGajYS+KTEcFqhmZ/ZbRARM1itr
-iWJ9tAvjWAUKxqouPdop8A8wMsjqYcdYw8ohPM6PH6Lp3mZiCoUZaOrcHYv8OEQT
-uJNat7ekeU0xYFpguXfxKBIBYTZ+IPRnkww+Oyl+g5q1H7m5KTSWKDhAtXGalc0v
-EtCp8z7vGE0/XJOag9eTF0QStnrnNLn2nBRZMp6YsC1cIOpQoHSM7dS8gKlB4N2F
-n1eTNbkyMaNxorP3Yga8hPFRPy6gUYMZFJ4yRuscmQV6A30DagNlX1LXGYlywGQn
-Mp3tEvnusbM5gAiuLXN8nJv0FqHQTT6qBUvdts2hLgiqkvpUTcakt37GlhZTfvZ+
-mXQIc+ociQzLiOQ70qpxMqceVsjzbHl59RoKBkdxKdgvwq/m1hmD74ShuNkaUlxs
-u9ZbKAKaKLsnt4x3bYw1NMMZLAFASsn/wNDJhj9fI/riw0lqDyLBY960+gzBzCQ6
-fswzx/tDSY8RkSRXZX9h
-=U8Bf
+iQIcBAEBCAAGBQJTNlrYAAoJEPGu1DbS6WIARX8P/R+9Q2UW6NQ90fENfvZQQyNW
+c00ImdzDiYGm3roe8isASeXbghWmkcI/V6v6eVfQW6juk2ldUl5gd+2bweAS7WO9
+LVaF79y6RxgJchZVEIl1nLsDHMkAzYVWThpI8Ia9I5bkScTFKSL7R3GkJARWnSrP
+plPDI5UqonETQ+obhitl8dU3SGVs1PTikzA1slD0dQOhI5xYPHYNMeCt8uqU/MyW
+un6ECgtHl46W8kyTZ4dfvsGhS/0y2mRJW/fL5UMZmBmWxKDYiT8PORE3AIJffBKM
+As0K10I1VUIR+JKSQSwi9FVuY62bWNyrC9mOmbAWO7TWCmSpFqvBB2hrtDWvRvWl
++uZL2PgssyD3ScvZoRLPDbsM1kOEbUU7qoFEp5hMKewEgwAqNP1+B5Vx/Jvw8qe/
+jB0xT5gTTdQvr/cCFOtTkBqCxhQz2STCapvopEjiRnC30kHNqetU8Zeex2ls6ux1
+cAo2CcpjE3LskneycN5CAeMYJaulvVpOby8dHny/9RKqDBhY8zed8K22QKCJKE1Y
+NV9gslAJwjmZVFEIL5aPqzjlJ1uES0vGMnroEYeJe/v7nOvaWZUa3oob0sypJ8Xc
+wjG2F1RGTcRmGLYYPEgQEruFo0ASLBHoraaWNNKmaTIYkXyXhEZNx+zi1qnPVML+
+clAAA0GqLhVoAd93xdbN
+=bPzf
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_compile.eblit b/sys-libs/glibc/files/eblits/src_compile.eblit
index d02f0d52230c..1cb0f7c160a8 100644
--- a/sys-libs/glibc/files/eblits/src_compile.eblit
+++ b/sys-libs/glibc/files/eblits/src_compile.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.37 2014/01/17 06:23:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_compile.eblit,v 1.38 2014/03/29 05:31:59 vapier Exp $
 
 glibc_do_configure() {
 	local myconf=()
@@ -121,6 +121,20 @@ glibc_do_configure() {
 	if is_crosscompile && [[ ${CTARGET} == ia64* ]] ; then
 		sed -i '1i+link-static = touch $@' config.make
 	fi
+
+	# If we're trying to migrate between ABI sets, we need
+	# to lie and use a local copy of gcc.  Like if the system
+	# is built with MULTILIB_ABIS="amd64 x86" but we want to
+	# add x32 to it, gcc/glibc don't yet support x32.
+	if [[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib ; then
+		echo 'main(){}' > "${T}"/test.c
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/test.c -Wl,-emain -lgcc 2>/dev/null ; then
+			sed -i -e '/^CC = /s:$: -B$(objdir)/../'"gcc-${GCC_BOOTSTRAP_VER}/${ABI}:" config.make || die
+			mkdir -p sunrpc
+			cp $(which rpcgen) sunrpc/cross-rpcgen || die
+			touch -t 202001010101 sunrpc/cross-rpcgen || die
+		fi
+	fi
 }
 
 toolchain-glibc_src_compile() {
diff --git a/sys-libs/glibc/files/eblits/src_unpack.eblit b/sys-libs/glibc/files/eblits/src_unpack.eblit
index 15e8895d4e92..cdcd8e48685f 100644
--- a/sys-libs/glibc/files/eblits/src_unpack.eblit
+++ b/sys-libs/glibc/files/eblits/src_unpack.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.24 2013/09/28 22:07:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_unpack.eblit,v 1.25 2014/03/29 05:31:59 vapier Exp $
 
 int_to_KV() {
 	local version=$1 major minor micro
@@ -165,7 +165,7 @@ eblit-glibc-src_unpack() {
 	# http://sourceware.org/ml/libc-alpha/2012-05/msg01865.html
 	if ! version_is_at_least 2.16 ; then
 		echo 'int main(){}' > "${T}"/gcc_eh_test.c
-		if ! $(tc-getCC ${CTARGET}) "${T}"/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
+		if ! $(tc-getCC ${CTARGET}) ${CFLAGS} ${LDFLAGS} "${T}"/gcc_eh_test.c -lgcc_eh 2>/dev/null ; then
 			sed -i -e 's:-lgcc_eh::' Makeconfig || die "sed gcc_eh"
 		fi
 	fi
diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild
index 4f298d2a47f9..35ddf4239492 100644
--- a/sys-libs/glibc/glibc-2.17.ebuild
+++ b/sys-libs/glibc/glibc-2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.32 2014/03/20 13:38:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.33 2014/03/29 05:31:59 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
 
@@ -24,6 +24,7 @@ case ${PV} in
 	RELEASE_VER=${PV}
 	;;
 esac
+GCC_BOOTSTRAP_VER="4.7.3"
 PATCH_VER="8"                                  # Gentoo patchset
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
@@ -88,19 +89,19 @@ else
 		!vanilla? ( sys-libs/timezone-data )"
 fi
 
+upstream_uris() {
+	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
+}
+gentoo_uris() {
+	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
+	devspace=${devspace//HTTP/http://dev.gentoo.org/}
+	echo mirror://gentoo/$1 ${devspace//URI/$1}
+}
 SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/http://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
 	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
 	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
 )
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
 
 # eblit-include [--skip] <function> [version]
 eblit-include() {
@@ -153,6 +154,7 @@ done
 
 eblit-src_unpack-pre() {
 	GLIBC_PATCH_EXCLUDE+=" 6600_mips_librt-mips.patch" #456912
+	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-4.7.3-multilib-bootstrap.tar.bz2
 }
 
 eblit-src_unpack-post() {
diff --git a/sys-libs/glibc/glibc-2.18-r1.ebuild b/sys-libs/glibc/glibc-2.18-r1.ebuild
index 7ff4fe446005..30a9c74f6126 100644
--- a/sys-libs/glibc/glibc-2.18-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild,v 1.2 2014/01/25 22:06:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.18-r1.ebuild,v 1.3 2014/03/29 05:31:59 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
 
@@ -24,6 +24,7 @@ case ${PV} in
 	RELEASE_VER=${PV}
 	;;
 esac
+GCC_BOOTSTRAP_VER="4.7.3"
 PATCH_VER="4"                                  # Gentoo patchset
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
@@ -88,19 +89,19 @@ else
 		!vanilla? ( sys-libs/timezone-data )"
 fi
 
+upstream_uris() {
+	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
+}
+gentoo_uris() {
+	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
+	devspace=${devspace//HTTP/http://dev.gentoo.org/}
+	echo mirror://gentoo/$1 ${devspace//URI/$1}
+}
 SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/http://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
 	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
 	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
 )
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
 
 # eblit-include [--skip] <function> [version]
 eblit-include() {
@@ -153,6 +154,7 @@ done
 
 eblit-src_unpack-pre() {
 	GLIBC_PATCH_EXCLUDE+=" 00_all_0012-mips-add-clock_-g-s-ettime-symbol-compat-hacks.patch" #456912 #481438
+	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-4.7.3-multilib-bootstrap.tar.bz2
 }
 
 eblit-src_unpack-post() {
diff --git a/sys-libs/glibc/glibc-2.19.ebuild b/sys-libs/glibc/glibc-2.19.ebuild
index 646c1a264daf..93e0aa46f858 100644
--- a/sys-libs/glibc/glibc-2.19.ebuild
+++ b/sys-libs/glibc/glibc-2.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild,v 1.3 2014/03/12 13:34:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.19.ebuild,v 1.4 2014/03/29 05:31:59 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
 
@@ -24,6 +24,7 @@ case ${PV} in
 	RELEASE_VER=${PV}
 	;;
 esac
+GCC_BOOTSTRAP_VER="4.7.3"
 PATCH_VER="1"                                  # Gentoo patchset
 NPTL_KERN_VER=${NPTL_KERN_VER:-"2.6.16"}       # min kernel version nptl requires
 
@@ -88,19 +89,19 @@ else
 		!vanilla? ( sys-libs/timezone-data )"
 fi
 
+upstream_uris() {
+	echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
+}
+gentoo_uris() {
+	local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
+	devspace=${devspace//HTTP/http://dev.gentoo.org/}
+	echo mirror://gentoo/$1 ${devspace//URI/$1}
+}
 SRC_URI=$(
-	upstream_uris() {
-		echo mirror://gnu/glibc/$1 ftp://sourceware.org/pub/glibc/{releases,snapshots}/$1 mirror://gentoo/$1
-	}
-	gentoo_uris() {
-		local devspace="HTTP~vapier/dist/URI HTTP~azarah/glibc/URI"
-		devspace=${devspace//HTTP/http://dev.gentoo.org/}
-		echo mirror://gentoo/$1 ${devspace//URI/$1}
-	}
-
 	[[ -z ${EGIT_REPO_URIS} ]] && upstream_uris ${P}.tar.xz
 	[[ -n ${PATCH_VER}      ]] && gentoo_uris ${P}-patches-${PATCH_VER}.tar.bz2
 )
+SRC_URI+=" ${GCC_BOOTSTRAP_VER:+multilib? ( $(gentoo_uris gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2) )}"
 
 # eblit-include [--skip] <function> [version]
 eblit-include() {
@@ -151,6 +152,10 @@ for x in setup {pre,post}inst ; do
 	fi
 done
 
+eblit-src_unpack-pre() {
+	[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-4.7.3-multilib-bootstrap.tar.bz2
+}
+
 eblit-src_unpack-post() {
 	if use hardened ; then
 		cd "${S}"