Check for the __sync_fetch_and_add symbol directly rather than trying to mess with the defines in the CPP output #199334 by Xavier Neys.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

4 files changed, 45 insertions, 57 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index d6470939160c..d2a187bc015d 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.761 2011/03/18 20:25:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.762 2011/03/20 22:23:47 vapier Exp $
+
+  20 Mar 2011; Mike Frysinger <vapier@gentoo.org> files/eblits/common.eblit,
+  files/eblits/pkg_setup.eblit:
+  Check for the __sync_fetch_and_add symbol directly rather than trying to mess
+  with the defines in the CPP output #199334 by Xavier Neys.
 
   18 Mar 2011; Mike Frysinger <vapier@gentoo.org>
   files/eblits/src_install.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 6d2c10f0224c..e2ff942e2071 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -15,24 +15,18 @@ AUX 2.5/glibc-2.5-hardened-pie.patch 1569 RMD160 8746aeb9f9c68ca153d93cf92c9df93
 AUX 2.6/glibc-2.6-gentoo-stack_chk_fail.c 9545 RMD160 9a21c9deb6ebca5d2245e3bb50b53ce035967a5f SHA1 11ad52117fa55bbe51b429043df49767c7f58de0 SHA256 1410ded812be80d452eada5f9d6b9bd7bdb504c14f01cc27dce3e36b6f92b92a
 AUX 2.6/glibc-2.6-hardened-inittls-nosysenter.patch 8674 RMD160 f4e7df0cb25292afc13e18332569d2ca288fdf92 SHA1 7f34ef26d6607321e0ec5ad0f389cb1aedf5e0da SHA256 cf58ded8fbe9fcb3dc094521feec2588c1520ff2c632b20c69d6a210325c4fcf
 AUX 2.7/glibc-2.7-hardened-inittls-nosysenter.patch 8755 RMD160 b674894f3b16f63193bb8040f8a5657dce82e1f9 SHA1 79fb3a4454b85af70dac95dd79134be3fe3a9201 SHA256 b0b1bf0746f7160b89cf281502b95c38dec9cb948d6a50a907b84fd6230a2dc3
-AUX eblits/common.eblit 8967 RMD160 43565803c4f2dfccd0c954d81fb7a936b8b6760d SHA1 8ff9af7950340ad8dabf361f2d41499c96c728b2 SHA256 84c5aa9746c7e57c41f14a0208e91360052207c872943270e06871ef4a644373
+AUX eblits/common.eblit 9091 RMD160 84b90f1382c192ac291645729ce784bd6240fd0a SHA1 d2e872b131784f297c5f58911e719de84f34fc50 SHA256 4a688baf09d7157f405a2a759a58210f27ab79e708d4f6a327d149387bfc655c
 AUX eblits/pkg_postinst.eblit 1159 RMD160 4b99846819bf0471d1104a8a17dd260796644f9d SHA1 4a2980fede3edebc7960d40db7cf935c7c854859 SHA256 76c403cf5c77a3a3bb7441566335f0c8da2584eaa21f05ab400e7bb00f9db810
 AUX eblits/pkg_preinst.eblit 3764 RMD160 f9a9d43e2d2d8df073be7e1b66655e651cb10740 SHA1 b987e2802201e0f44c357ffc7b92da4aa77cf377 SHA256 41baa253ea529156d628108247545235c4ec377b184e7824bd790eba1361299e
-AUX eblits/pkg_setup.eblit 3086 RMD160 24a50d7a2c5e824e83573e9b69eb47cb0f4b225f SHA1 33624942a8a828fc3328bd1e61a8da2f00f56e61 SHA256 7b25d97376e2da04c6f94a0bfd8a94dcf32f4ce0a524677548d240a6abbc6d6d
-AUX eblits/src_compile-2.11.2.eblit 5904 RMD160 91b8119c650157afb633cf0de4e58138fd215df3 SHA1 a9945295122316ead82b41e10780f424d493943f SHA256 c9d3eca5bdd9202aa854edaabb824aee6f068dc8dbe5117acd235d1aa81637a6
+AUX eblits/pkg_setup.eblit 3318 RMD160 4a38e5f9a385d9134b54ab27a654e9a83eeb9258 SHA1 85341ef8fbf37e3270719cc940d26fd6f1168d6b SHA256 ca79f36240221519e460b8ff08e8453d624731991c3efc27d45068d8c15b756e
 AUX eblits/src_compile.eblit 5844 RMD160 29faae79a18f157e1412d527380c7b70cf7d2442 SHA1 7be66723d4b8af71dfda1bcd0308791acbdbf12e SHA256 29673cef6619ca56bc9ce8eaf8c1a995857626f6bcd72251c5a339ad0574c6fd
-AUX eblits/src_install-2.11.2.eblit 7774 RMD160 899189807a292cf7fc115e2146340c4a8de0fb10 SHA1 8371f6f35234eff1c6729208c36ac7aba220784b SHA256 df5051455fbd2681a698cc21dae8f08349fe230f42054c309a431c9e38489662
-AUX eblits/src_install-2.6.eblit 7785 RMD160 29e196b3e3669e99257588f2da40bda20e3b689e SHA1 d3a7b22e219c2be3e8fd4345332a28e22dd24172 SHA256 3c48efe7ce590aa0ccfef4028dc77e47526227e715a38441e781c29a4b5eac56
 AUX eblits/src_install.eblit 7754 RMD160 6817600faa42b60f8ad1f33caabac0268450d53b SHA1 46c3ce7cf07c3c0814ec420535f4079d2091510a SHA256 da5b795d0e2c13ef8cd9b3c5a9aa4e3093d07e8b9a092fbf9c8a1e130d0b1101
-AUX eblits/src_test-2.11.2.eblit 1169 RMD160 d7d1f430453e5278c2f3d4ee4815faff3a47a03a SHA1 9d48060c34ef901cbe6e8d7880ea923c8e1b7f28 SHA256 95b14845a80a74abc5b5c5146f2291524d7dd66f8e1bd9d12b42a3234a065010
 AUX eblits/src_test.eblit 1172 RMD160 a70e31e655cd3e306af6a498002de85b72258566 SHA1 4aec15e6ab67279258fd23400701fd38c106a38b SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727
 AUX eblits/src_unpack.eblit 5631 RMD160 ff841c2b06e2896dd178d5795da0cd9da2f1aa01 SHA1 b2cbf59f27e55aa0d6ae5c0b3d1cc766df6866c5 SHA256 98c5e9c71f0c3529260cf538cf5935e5b58955cd0b9a721fe90abb661921a5b4
 AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c2021b7b3ed3e798618e2a38244a SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8
 AUX nsswitch.conf 503 RMD160 f375f92f6b41029c93382c39cef896261b140cfc SHA1 42f7f5cc3de75c69bf60d806ac8490106ea63326 SHA256 6c38b8642d5da884327ad678d0351d57be3621562253bd9711394bad87e45e2d
 DIST glibc-2.10.1-patches-6.tar.bz2 113352 RMD160 6874a93e993bb082fc4fd23582b5f6bd1044ec28 SHA1 2448fa11229deeaf7a2135510d35bbdbfe9f31e0 SHA256 36a838d5be4fb96f0471d288f172443df28867c301e7790667e1cb57615e6c04
 DIST glibc-2.10.1.tar.bz2 16106243 RMD160 ca102519ab32714e788a0db5dd43c2f9962c86e9 SHA1 cb478cf9d6e2c905a1a4f4a2cae44a320b8dc50b SHA256 cbad3e637eab613184405a87a2bf08a41991a0e512a3ced60d120effc73de667
-DIST glibc-2.11.2-patches-6.tar.bz2 117116 RMD160 5e2dda6ddd8620af9513aae1033595ebd149c8f9 SHA1 b0f4b73a49d1117649acd74523bb5358e54cbf5e SHA256 490b81357fc43f2d23a050ed39440363b223c1e3f34e77b4596b981680fd9f23
-DIST glibc-2.11.2.tar.bz2 15675392 RMD160 15d14fb6b0b58ec3fb7781efa2f8a558fcb99a7e SHA1 23b477f4816a97e007be1e98abc1ffe2af13ba9e SHA256 c2ac76ee363eed31b2a377489fb2818139f4668b5505ad583009eb9b0e228713
 DIST glibc-2.11.3-patches-2.tar.bz2 110859 RMD160 82150c671e19df102cf4cf92f5ff914e6328c064 SHA1 e371d86437839227c5927cf8c13730aeb893f75b SHA256 4dabab8bbe0acf80bac483105ef17f0968be30bb67579a5225e1bab590948d29
 DIST glibc-2.11.3.tar.bz2 15667797 RMD160 a5cc802ddff6c2e96f63a9dacbb429d0e9114e2d SHA1 2685601493829b0399578c87add614786b98c30b SHA256 9c10538262c13018910721b8160e6caf65ba38ca2750c5710bd220e44d696afa
 DIST glibc-2.12.1-patches-8.tar.bz2 112063 RMD160 5bf50dbd1bb30d5cc9a41ebfdc72fa8aaab31389 SHA1 4084514fea111eed609721ba45339ca45060e34e SHA256 564fe8d9dbf80763c32eca13129ecc69aa276eb8364fe15b400d0cf0cbbf7085
@@ -41,54 +35,26 @@ DIST glibc-2.12.2-patches-2.tar.bz2 102778 RMD160 3ea56ec3bc175414dfe095965541cb
 DIST glibc-2.12.2.tar.bz2 15667759 RMD160 1855ebbbca52dc036de159cca720f6153e173e21 SHA1 3ef6d36eee2dc7c4351f215f689e6a04c161a35e SHA256 22f8eb3c49b9eb5e88fc249daf8670899adef24eb1f74708fb150a6502fa1216
 DIST glibc-2.13-patches-4.tar.bz2 101869 RMD160 fe908bdaa1dcff39b53e8c25a97438009e36e377 SHA1 f5a38549b92d42c83aad886b33839f39dd1e38a6 SHA256 18cd3e413e6b73d496975235967c243b2c25a9bce13c080f0a0913522a88e31b
 DIST glibc-2.13.tar.bz2 15725729 RMD160 cf34e4a06a2602deed709e2ee10cf7446a824989 SHA1 14d83dced873a21a3da6a0bfa0926f40d82ef980 SHA256 0173c92a0545e6d99a46a4fbed2da00ba26556f5c6198e2f9f1631ed5318dbb2
-DIST glibc-2.2.5-manpages.tar.bz2 14667 RMD160 4f6e1fde042c19aca4718c8e06e19dc2786a1334 SHA1 7bb5615af98a8b5fb2ef91a47148fedef227c544 SHA256 03850134bd0c670d8b5fe5e3bad0dac2efdb7078ddf69e0dbcdba380f4d5697c
-DIST glibc-2.2.5-patches-1.0.tar.bz2 21176 RMD160 4575e4355a919b7865829d22ab86cbdcd53253ee SHA1 f8fa215694673c5ee69f00b3986bcd34d48c7d85 SHA256 39e20bbd032db00c3b0781a0055ed092e9ebcbc2f71e4c1930fd93cd67d374fd
-DIST glibc-2.2.5.tar.bz2 12404613 RMD160 90e78da2f4c90f4b4476edb10ccc3fea150aeb4a SHA1 69f3d998a3dbf0868bcd523317f066ce3c5ccdf2 SHA256 4a63662ce8024583adeca1af2643acab6d895281112c492d6ef3b4f35e26893f
-DIST glibc-2.5.1-patches-1.0.tar.bz2 533092 RMD160 1081874bfba24d7e04c225a6ec3e7e7c18bb006e SHA1 969d32580ffa845f3411a043bbd498378f348842 SHA256 d54847e35b1533ac5eee0dac36cc358b75cdb85e90fa589cf4270e69338197b0
-DIST glibc-2.5.1.tar.bz2 15421428 RMD160 06d234a70a240f9e344c36b6a9789019ca0bf571 SHA1 2b7da136df025bb8c787be3351cba58374226d9c SHA256 a29e0d149816364820512f71b9c9ebd0f8a148fbeaac42b79e2c342532e5bf8e
-DIST glibc-2.6.1-patches-1.2.tar.bz2 89639 RMD160 6a5b91d73eecbed3a867ffc19272efcb82f20a54 SHA1 3d562945a61ca9b6854c6436ca9c68355af8671e SHA256 218b8491d6f0a3e550514fab5e6db60ab9a031f00e71ec3b9e7f5db5eacbc44c
-DIST glibc-2.6.1.tar.bz2 15767401 RMD160 a58226e394780a6996d608febf5881134990919e SHA1 85573fee8d79180165e9466a1fc25133b5792190 SHA256 3ded3a3c3ba2cf02d72479a5cc0829c7c261a9d0934e49a79233de9fa276ec22
-DIST glibc-2.7-patches-1.7.tar.bz2 97989 RMD160 f0404ab12f8ed7d6a42449e4366bc5555894fefb SHA1 b0e7b27fadb3c53069bb5568b93e833c0783f9d3 SHA256 4f71345bc2ef73975f921a5bdbc4841e8911a36fec7edc17f1e758a9688a7153
-DIST glibc-2.7.tar.bz2 15976860 RMD160 c5c0b5a611d26956c46a289478b3349cea2ebf72 SHA1 ccc70e95db826e4b1fd3b484154402fdc3df88f7 SHA256 4224a522ac4ee0fd89eb337e7505e280dfb05e2fe1ad44339ba8874081c0451a
-DIST glibc-2.8-20080602.tar.bz2 16235726 RMD160 8781f2b1dbd22c6579208a689be38a444b5242c7 SHA1 68c2bfcf5f385449c3cb7efbf1f0d425d14cdaad SHA256 142eaba19eb85121206ee034fd828ca5dcd1bf2bfa940fef92c37457c06a6d48
-DIST glibc-2.8-patches-6.tar.bz2 103171 RMD160 c6a9710e53fa6b3698aea1a5f0a497155cf2a1c5 SHA1 39fe516a150621fc34418e23ac1c38cb1f7c1406 SHA256 dc335095de83ff4ff405c9aaf5b3ee3d82148888c73b31081ae1c706510973c2
-DIST glibc-2.8-ports-20080602.tar.bz2 469234 RMD160 57ae79a79c6f82f5ff217e9052f4569c136dca7d SHA1 c3a45ea27c9eb1bf99f1caafe085b50951089384 SHA256 1f3665e80b5832f7d281c109bc2f5412521cc9ccc3bd7b499fd493ff5eb9aa9b
 DIST glibc-2.9-20081201.tar.bz2 16430489 RMD160 1e1feb4ee9c0892a0544c05adb6dd249544621cf SHA1 5756ca3b543a370c4ec9ffc8038b72bf0aa61c71 SHA256 6f8e515775e20ed48610860d10315adda418a3649b3465f36ee5cd467364a8f6
-DIST glibc-2.9-patches-5.tar.bz2 101693 RMD160 8cd377be020bf95a30862d77c215c16dc544602f SHA1 103839660f4e55871bf68835f8fec83d9afecdec SHA256 6f61c3e212c82eb118780573ac80d61835ff3a98fbea68b6f03a52009cce7d35
 DIST glibc-2.9-patches-7.tar.bz2 106373 RMD160 06fcd1e07521942e3edb822719e398a5a45a0bf7 SHA1 a3c63e638b99a5b4422cc0ee54c0f75e62b59662 SHA256 165d7d9babd332b115ea7e72f879ffab6ee897b761aa052f1b409a028a731b53
 DIST glibc-2.9-ports-20081201.tar.bz2 487663 RMD160 80eb0035ed2e021e79755d4151ccd6d73cd78d8d SHA1 90a6ecbce37aabe6093c4dd0c8817cbf86321627 SHA256 19bb6e89855171d7ae01aef92054dfe4524521fbc13c67bfaa3ee81944210744
 DIST glibc-libidn-2.10.1.tar.bz2 102248 RMD160 0fbb3ecc09f59f0b9e90e0669bd9cd6075164173 SHA1 50c1ac0d9ddff6eb83f75aa1c4cb84ba6fffa0cd SHA256 0fa72d1dd06a30642d3bb20a659f4ed0f4af54a205d7102896b68169b38676dc
-DIST glibc-libidn-2.5.1.tar.bz2 102290 RMD160 683d557160b28a2369c9dd53ab36367e6641b6bb SHA1 6323f3533f734e8338fd21f9c878b870d6f79fdf SHA256 800e2b35443ffff200970df6d35a7afc2eb6e75c88a8074391867545e46d9f2e
-DIST glibc-libidn-2.6.1.tar.bz2 102319 RMD160 20b86f6c40365084898916fe614b210a7b0ec2e7 SHA1 5440648e71078ecb179c4501b5f6717b54294945 SHA256 67c98ca1299f5f25eaece256d033e0e63bcf6876b920ca62a1fe61ac62c5c451
-DIST glibc-libidn-2.7.tar.bz2 101939 RMD160 17a9692cc59d9f41d6b9fcd68f283f401e206483 SHA1 2338cc9b5795f5e97a19aac6d7d00ab750e81ac3 SHA256 07de78810a5320d696792b67131c4cf3d6654aee015a6b74820d66fb00799000
-DIST glibc-linuxthreads-2.2.5.tar.bz2 168269 RMD160 4886cb3ccd1a05c48dafb2565b08835551033ecb SHA1 bb0137b2d80641c3caaba37571cebbbc5945e5a7 SHA256 c3d0fa7aa579537afb5087e058a9748db9ab0ffe5fdcf4330224e19c35c05cf5
-DIST glibc-linuxthreads-2.5.tar.bz2 242445 RMD160 788484d035d53ac39aac18f6e3409a912eea1cfa SHA1 eb7765e5c0a14c7475f1c8b92cbe1f625a8fd76f SHA256 ee27aeba6124a8b351c720eb898917f0f8874d9a384cc2f17aa111a3d679bd2c
 DIST glibc-ports-2.10.1.tar.bz2 584860 RMD160 1f094d4df18306ccb01037d07f0a0e3014fdfc60 SHA1 3cc9eff22d624c5fb6d951bbcb31b40112238fe7 SHA256 b1f1ec9720036a3a33598b8478eef102535444a083d5b5813a6981ed74ab4071
 DIST glibc-ports-2.11.tar.bz2 599606 RMD160 e7262cb903b42d27bd0666fb170d2abb4c8b478f SHA1 76a0513c74b80e34f81abcaabbc538fa0f33b6a4 SHA256 38d212b1a22ed121c97f2827e7357e3e077084635ebc197246993d328b1b6589
 DIST glibc-ports-2.12.1.tar.bz2 621800 RMD160 98b5d5f544336f16bfc8af193e5c447ee6c197ed SHA1 396c1e3958a7563ebdffc8ada8e142e0d6c0b225 SHA256 3986c166d08c30b83c9cc7d972651550b548386d5a02e4e4c985d9832de83110
 DIST glibc-ports-2.13.tar.bz2 625945 RMD160 676406e35c8e4fdceb4fcfa83bfbdb1ef3a3aa6a SHA1 1cc771b4bf80f4b0872a342763f4aa4a9a9292cd SHA256 b11c4501ae929883447f409c31d65e82822b1c5693075a825a3d54612876ee5a
-DIST glibc-ports-2.5.tar.bz2 409372 RMD160 e7e29df135a5f0f72760d10e5ad46de038e40725 SHA1 7da6257e641759ed29c4d316700fce6f604bc812 SHA256 80c38a005325e7539012bd665fb8e06af9ee9bfc74efb236ebff121265bfd463
-DIST glibc-ports-2.6.1.tar.bz2 431292 RMD160 aa6ba7bc58932c81416c3407a8dd0b5e61f5454a SHA1 f620103c8b02ced80a425c79691573f949bf5d6b SHA256 d094028bc6d6691f56b4efeff7cd7e1c7ca10733e0cb5efc36e8fb08d8324bf1
-DIST glibc-ports-2.7.tar.bz2 435392 RMD160 b9b96b357a394f29d5617aaa26a2c000bcf88874 SHA1 2186eac2248f1dd604f20a9dc8215ce12319d273 SHA256 3e481996259af87c3581da23481970a27de679e3c87cfa9a5a59751cd20c7b44
 EBUILD glibc-2.10.1-r1.ebuild 8161 RMD160 b21cba3d443ff63ebb776c9f15959c1e1e660136 SHA1 e08b8a9ef1f33e85912c5a9e70ce5fd885727bcd SHA256 19b9232a48a904243440581472a71f79bae7cc9674d26d875a6ab0b53ccee75d
-EBUILD glibc-2.11.2-r3.ebuild 8375 RMD160 800dbbaf586794c984d02375a7d984b9d4b6f69a SHA1 3b5c162b3aec1ffe113a264f753f2975118e8adc SHA256 fae93ee25e1ca48bbc7876b3cf0f11f2b146b184420798195291ce79ef7f79b2
 EBUILD glibc-2.11.3.ebuild 8372 RMD160 294a39004fbeafba4685bab0016ca8825510c14f SHA1 4417bb5e3b3cde5b9e10e8a4cf3dad15c0965563 SHA256 a05e5ecdd944c52f3cc14a06d0325fb411822690a01bd72e9921d0c17947de62
 EBUILD glibc-2.12.1-r3.ebuild 8742 RMD160 59a9f5cf261a657ccbe3c2913b6b64ad57c61c3b SHA1 5a190f7915f945a8ebf002b55dc86c27cfbafca9 SHA256 122b698a3f2519106636fee326d72fcf2f2369eb807ef43d573197c99bb252e3
 EBUILD glibc-2.12.2.ebuild 8740 RMD160 2630d8ca3ff0afb730ed157b02c7989146e5435f SHA1 b326995c8fc11eb09fa97eacaec4737b732dd2ea SHA256 7d96388127871ff075f139f17175ad42c72f1bacefb8c9746172fe0b355a7e68
 EBUILD glibc-2.13-r2.ebuild 8645 RMD160 f39c38c87d629624e193d218076973e0a6324d56 SHA1 36d5bd588fe447adb9bca1d8f54d89a5aba67b0c SHA256 e792a1988dbaada4fd423d0a548d72fa4110dea3aa9f9d6a879f83e80de52248
-EBUILD glibc-2.2.5-r10.ebuild 4756 RMD160 4f255886949a3a5d1ab7d41325b6b23b6d15dcbf SHA1 457db7a16a2ac9066c75b4a5d23484dcb0a8492e SHA256 9db3d80305f1c1318b8b111949c3b7980be9cfc1437144b022ff7ff39fcbfd0e
-EBUILD glibc-2.5.1.ebuild 38277 RMD160 49d75fb2d08c7f25c021d75b7c0f111e488967b1 SHA1 36b06b877a364ddafad46438867d8a2f3adc4c00 SHA256 d37cb3d398dfab33f915ecb5891fca46dcd910b16c1c8635425cb96fe68444be
-EBUILD glibc-2.6.1.ebuild 12436 RMD160 6e0eeeddcfb5e5cd5ec9ef2d52252e9a3c947da4 SHA1 9feb1cb46bbe8ace6f52af9160699822a7e85fb8 SHA256 e7efb5c8b8d0a9d3a63f7b59cd34d84b7d35bedb8da66e250559f2bdfec2851d
-EBUILD glibc-2.7-r2.ebuild 12941 RMD160 461ae1f64ad710426a485eb5593f1e13c4a618d8 SHA1 f7df279e9fffc3114cf666aecc3a97c633fe3c87 SHA256 088d0d5ed37ac5998e0391552591169b6a2af993c87ed4827532ef854e8d0e4a
-EBUILD glibc-2.8_p20080602-r1.ebuild 13488 RMD160 6b58dc46eb346a67557e5ce6b84a10a3688d649a SHA1 a89f61f4add7950715fedd27a4cc9fb68599f4c1 SHA256 f560d233bb3b0bcdda61fe6d052f54c253d43c9b31f7a2070e9b2f4003131b30
-EBUILD glibc-2.9_p20081201-r2.ebuild 7772 RMD160 ad3a0203d514fea907712ada8a9c3970267aa823 SHA1 690094c7a7b7c5a0b016f41ba519d4ecaa8a1cea SHA256 bb909d9117328ca426af80e6b6d78cb3a96b0efe03d511ead4bf8d62341f42a2
 EBUILD glibc-2.9_p20081201-r3.ebuild 7806 RMD160 6d696692a2e122bfdc149aea75368cea00bce92c SHA1 0df0da8ccd0a95084f849bdb92bfc3389efba74f SHA256 995c0e939cc7146e347d3f8caafbf4ad720a7caa7dfd0a9562f5a2877533a45c
-MISC ChangeLog 136827 RMD160 0f504848691a0d9edde44b9a4b68bebe79ae053f SHA1 67d80c1b8abdf21265e0b84205e1bf93e3fcebc8 SHA256 86a6b6fc1e286c646b61b724e6832d13dffff2acd24db424041d2a455c00220f
+MISC ChangeLog 137078 RMD160 1ec9cb0c260ad2067a87d62fed19c6a6dc1a784e SHA1 9aa9eeb6c3600d8d69ed2d80fa38d750584d5dd9 SHA256 4cb46bf66106c659463cb5c5317df68edf6721c27e718620c33c8bfbf6972191
 MISC metadata.xml 539 RMD160 cf4d236b54a77b3cea382d53e4e61721bd14169b SHA1 b54ad589378da193ddc89676f8468c6d1b79521f SHA256 d7cb6dd119c81b5bf12c360af3705ca31a56ffa8bec999b44faa63c183719c31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF0EAREIAAYFAk2GcZgACgkQaC/OocHi7JbZPgD3R+3zzAl98jTLCgyhBX3rQ9qy
-z+4dR/OamKuVp31B/wD8Cxz/LB+JCIggkwPOW/fTkqbbkg8loqO4rVmXiLhb23E=
-=0wzs
+iF4EAREIAAYFAk2GfrUACgkQaC/OocHi7JaFlwEAlvP0jYHRtp2PiuxPWqvdbGxz
+SVZPSGDsbQ9dZ2U44iIA/3R46/bHJe8BOztzhr7pK1YI5jkhSuKTyr92hOJfOefG
+=lG4y
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/common.eblit b/sys-libs/glibc/files/eblits/common.eblit
index a42108f1f514..6049c483e962 100644
--- a/sys-libs/glibc/files/eblits/common.eblit
+++ b/sys-libs/glibc/files/eblits/common.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.19 2011/03/20 21:28:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.20 2011/03/20 22:23:47 vapier Exp $
 
 # We need to be able to set alternative headers for
 # compiling for non-native platform
@@ -46,19 +46,19 @@ setup_target_flags() {
 
 	case $(tc-arch) in
 		x86)
-			# -march needed for #185404
-			local t=${CTARGET_OPT:-${CTARGET}}
-			t=${t%%-*}
-			if ! echo "" | $(tc-getCC) ${CFLAGS} -E -dD - | grep -qs __${t}__ ; then
+			# -march needed for #185404 #199334
+			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' ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
 				filter-flags '-march=*'
 				export CFLAGS="-march=${t} ${CFLAGS}"
 			fi
 		;;
 		amd64)
-			# -march needed for #185404
-			local t=${CTARGET_OPT:-${CTARGET}}
-			t=${t%%-*}
-			if ! echo "" | $(tc-getCC) ${CFLAGS} ${CFLAGS_x86} -m32 -E -dD - | grep -qs __${t}__ ; then
+			# -march needed for #185404 #199334
+			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' ; then
+				local t=${CTARGET_OPT:-${CTARGET}}
+				t=${t%%-*}
 				filter-flags '-march=*'
 				export CFLAGS_x86="${CFLAGS_x86} -march=${t}"
 			fi
diff --git a/sys-libs/glibc/files/eblits/pkg_setup.eblit b/sys-libs/glibc/files/eblits/pkg_setup.eblit
index 6f5ae2743ea1..a0143c76ba27 100644
--- a/sys-libs/glibc/files/eblits/pkg_setup.eblit
+++ b/sys-libs/glibc/files/eblits/pkg_setup.eblit
@@ -1,31 +1,48 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.5 2011/03/09 08:02:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_setup.eblit,v 1.6 2011/03/20 22:23:47 vapier Exp $
 
-glibc_run_test() {
-	local ret
+glibc_compile_test() {
+	local ret save_cflags=${CFLAGS}
+	CFLAGS+=" $1"
+	shift
 
 	pushd "${T}" >/dev/null
 
+	rm -f glibc-test*
 	printf '%b' "$*" > glibc-test.c
 
+	emake -s glibc-test
+	ret=$?
+
+	popd >/dev/null
+
+	CFLAGS=${save_cflags}
+	return ${ret}
+}
+
+glibc_run_test() {
+	local ret
+
 	if [[ ${EMERGE_FROM} == "binary" ]] ; then
 		# ignore build failures when installing a binary package #324685
-		emake -s glibc-test 2>/dev/null || return 0
+		glibc_compile_test "" "$@" 2>/dev/null || return 0
 	else
-		if ! emake glibc-test ; then
+		if ! glibc_compile_test "" "$@" ; then
 			ewarn "Simple build failed ... assuming this is desired #324685"
 			return 0
 		fi
 	fi
 
+	pushd "${T}" >/dev/null
+
 	./glibc-test
 	ret=$?
 	rm -f glibc-test*
 
 	popd >/dev/null
 
-	return $ret
+	return ${ret}
 }
 
 eblit-glibc-pkg_setup() {