start to fixup multilib cross-compile support with the help of kanaka

Package-Manager: portage-2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/

7 files changed, 302 insertions, 397 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 39e821edce9f..46319a1c90cb 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,141 +1,141 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a372415b48e3d01c0c39f5d79c947de2 ChangeLog 82055
-MD5 e5c30ea961ed5d60c6c4b7ee1fc240ae glibc-2.3.2-r12.ebuild 22495
 MD5 6726c272dd0883b0c6f06a920c7ef30a glibc-2.3.3.20040420-r2.ebuild 21726
-MD5 a789e9155b746cc1c16da9a7604a0fb2 glibc-2.3.4.20040619-r2.ebuild 21400
-MD5 d4685f67b36e4a0c1fc0db8516523d2e glibc-2.3.4.20040808-r1.ebuild 27749
-MD5 9273d9e4fbc4a4980eeb4cb9981c8770 glibc-2.3.5-r1.ebuild 39830
+MD5 9db53eb2d0b552d650ccd326244198ee glibc-2.3.4.20041102-r1.ebuild 34301
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
+MD5 9aff17873aa017c92ba07760cfb518ec glibc-2.3.5.ebuild 39955
+MD5 d4685f67b36e4a0c1fc0db8516523d2e glibc-2.3.4.20040808-r1.ebuild 27749
+MD5 c3271935de2a3d7296055f1bbaa06351 glibc-2.3.5-r1.ebuild 39639
+MD5 a789e9155b746cc1c16da9a7604a0fb2 glibc-2.3.4.20040619-r2.ebuild 21400
+MD5 16ec78d51fcd85e0561de9a3070a8300 glibc-2.3.4.20041102-r2.ebuild 41039
+MD5 98cbf278e188d0655f363253eeb59df7 glibc-2.3.5.20050722.ebuild 40331
 MD5 f8bf77d5057759d82db6401f9ff5211c glibc-2.2.5-r10.ebuild 4523
-MD5 0a9a45985dce2f25c8aa1718efeef75d glibc-2.3.5.20050421.ebuild 40136
-MD5 59be708036c0821f114f1e09c5c08f85 glibc-2.3.4.20050125-r1.ebuild 38987
-MD5 df6c4350019a26f2a4bbaea98ac9abc7 glibc-2.3.5.ebuild 40166
-MD5 342dba7dd62f757bf4e6e1c50f10a41f glibc-2.3.5.20050722.ebuild 40542
-MD5 9db53eb2d0b552d650ccd326244198ee glibc-2.3.4.20041102-r1.ebuild 34301
-MD5 9a33b8cf7323bc1d9092a713f6765434 glibc-2.3.4.20041102-r2.ebuild 41250
-MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
-MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
-MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307
+MD5 e5c30ea961ed5d60c6c4b7ee1fc240ae glibc-2.3.2-r12.ebuild 22495
+MD5 c40cb58e6c3e1f70d48005455360f093 glibc-2.3.5.20050421.ebuild 39925
+MD5 07db80121e48429c5d442b9209fb5b53 glibc-2.3.4.20050125-r1.ebuild 38856
+MD5 a372415b48e3d01c0c39f5d79c947de2 ChangeLog 82055
 MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808-r1 382
-MD5 c6d2446587eec5d7e0197f3e2713b9bb files/digest-glibc-2.3.5-r1 515
-MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
-MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
-MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
-MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
-MD5 13701e6cc0de584680502c0cd958f2cf files/glibc-sec-hotfix-20040804.patch 4319
-MD5 bbe355d94c5a36e11f543d12b70b5702 files/glibc-sec-hotfix-20040916.patch 3080
-MD5 c4300e2f8808cb38a308745ed8b77367 files/locales.build 602
 MD5 6d49cf08909f89da5748956452bebb03 files/nscd 1339
-MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
-MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
+MD5 7a909f8df7cc20f37fb7553c8dcb47b4 files/digest-glibc-2.3.5.20050421 604
+MD5 8d58079469aedb014a800101ef60558f files/nsswitch.conf 503
+MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307
 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54
-MD5 e8833674518301b1dc7798d5f856aad4 files/digest-glibc-2.3.5.20050722 604
+MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
 MD5 bed7cbcac1e8582deda43664e5b3f19c files/digest-glibc-2.2.5-r10 290
+MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r12 312
+MD5 c4300e2f8808cb38a308745ed8b77367 files/locales.build 602
 MD5 71c18ba0155b5cf1e7e4bf990225d566 files/digest-glibc-2.3.4.20050125-r1 521
-MD5 8d58079469aedb014a800101ef60558f files/nsswitch.conf 503
-MD5 75b85b24e4ded1b0e8a0a762d5805818 files/digest-glibc-2.3.4.20041102-r1 383
+MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
+MD5 e8833674518301b1dc7798d5f856aad4 files/digest-glibc-2.3.5.20050722 604
 MD5 6a7b14ffb6320bc8c7fc73e86f6bb973 files/digest-glibc-2.3.5 518
-MD5 7a909f8df7cc20f37fb7553c8dcb47b4 files/digest-glibc-2.3.5.20050421 604
+MD5 e4393f4721a207750581d6265d5f7f40 files/fix-sysctl_h.patch 376
 MD5 2a03ed91154589a9473bac46eacff1e9 files/digest-glibc-2.3.4.20041102-r2 387
-MD5 b3ce53b86060b6209a182366c501a0f1 files/2.3.5/ssp.c 4297
-MD5 04bcec718f2883f28bf862b7e390d1b0 files/2.3.5/glibc-2.3.5-frandom-detect.patch 3080
-MD5 13dd059e6383c7cac94d1bda126af21d files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch 1302
-MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
-MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
-MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
-MD5 23bbb51d1008f3009e6f1867b284c9bc files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
-MD5 f15c6dec40cefa86dae48a7dcb3b779a files/2.3.1/glibc-2.3.1-librt-mips.patch 396
-MD5 d84791059f1b4e7b157b3bbefe783208 files/2.3.1/glibc-2.3.1-stack_end-compat.patch 751
-MD5 dc18731db5bd28b8bd2074fc9177fd35 files/2.3.1/glibc23-07-hppa-atomicity.dpatch 2519
-MD5 080146d608b878d517b5cf4c29f0ef08 files/2.3.2/glibc-2.3.2-alpha-crti.patch 378
-MD5 9ef93639d5016677d41e5ec986fcb7f5 files/2.3.2/glibc-2.3.2-alpha-pwrite.patch 918
-MD5 d7097bf7fe910f2cba6ec69f86eb1958 files/2.3.2/glibc-2.3.2-alpha-sysdeps.patch 939
-MD5 afa967d5fea8e467dda9c588f5600ed1 files/2.3.2/glibc-2.3.2-amd64-nomultilib.patch 506
-MD5 523558956091d4ffcd33b72c57ac4bac files/2.3.2/glibc-2.3.2-arm-bus-defines.patch 276
-MD5 cfce14f1f90a3903ed076a5209198ce5 files/2.3.2/glibc-2.3.2-armformat.patch 416
+MD5 75b85b24e4ded1b0e8a0a762d5805818 files/digest-glibc-2.3.4.20041102-r1 383
+MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
+MD5 13701e6cc0de584680502c0cd958f2cf files/glibc-sec-hotfix-20040804.patch 4319
+MD5 c6d2446587eec5d7e0197f3e2713b9bb files/digest-glibc-2.3.5-r1 515
+MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
+MD5 bbe355d94c5a36e11f543d12b70b5702 files/glibc-sec-hotfix-20040916.patch 3080
+MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53
+MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
 MD5 fa3bf332c71b0b5af56b536564abc480 files/2.3.2/glibc-2.3.2-assert.patch 1596
-MD5 855edac3c5abd21b4617408d4e3b5ae3 files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch 2424
-MD5 2f6605aae9bc4e538af783c0b2be3a7f files/2.3.2/glibc-2.3.2-decc-compaq.patch 1422
+MD5 03cbfe983ca93434ae6698f13d14c0e8 files/2.3.2/glibc-2.3.2-mips-configure-for-n64-symver.patch 741
 MD5 1a926f1adc2f321abb31b1e11024e3ac files/2.3.2/glibc-2.3.2-dl-reloc-calc-fix.patch 1405
-MD5 8d75a288ff9aa450717048b43497c82c files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch 1945
+MD5 9ef93639d5016677d41e5ec986fcb7f5 files/2.3.2/glibc-2.3.2-alpha-pwrite.patch 918
+MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.2/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
 MD5 0c85c7ef9fbb066ad30ce8b6eb1c6228 files/2.3.2/glibc-2.3.2-fix-omitted-operand-in-mathinline_h.patch 680
-MD5 026be2442305eef0a3e3ff897a14768e files/2.3.2/glibc-2.3.2-framestate-USING_SJLJ_EXCEPTIONS.patch 440
-MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.2/glibc-2.3.2-frandom-detect.patch 1770
-MD5 a505a59f53c5e068728d0aba44007a10 files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch 671
+MD5 ba477be20da9885349e4599de7a08c18 files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch 2532
+MD5 855edac3c5abd21b4617408d4e3b5ae3 files/2.3.2/glibc-2.3.2-cispeed-cospeed-fix.patch 2424
+MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
+MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.2/glibc-2.3.2-owl-malloc-unlink-sanity-check.diff 1425
+MD5 3d32067de612f477862e9b24c158a7ce files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch 1153
+MD5 3eeb5a5b2f01b1fdb7a4af923e5b0cec files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch 6638
 MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.2/glibc-2.3.2-got-fix.diff 752
-MD5 cd0306085902d8629f2a77061cacdfd2 files/2.3.2/glibc-2.3.2-ia64-LOAD_ARGS-fixup.patch 4445
-MD5 15ac94e1ccc48f31120960dfe006818a files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch 2262
-MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088
-MD5 bfb5e3c2c46359a8c426e98fe0e39838 files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch 6344
-MD5 03cbfe983ca93434ae6698f13d14c0e8 files/2.3.2/glibc-2.3.2-mips-configure-for-n64-symver.patch 741
-MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
+MD5 080146d608b878d517b5cf4c29f0ef08 files/2.3.2/glibc-2.3.2-alpha-crti.patch 378
+MD5 f62924cbf762eb230514a9859522f5e7 files/2.3.2/glibc-2.3.2-nptl-fix-include.patch 247
 MD5 df41c3a20ead370c2208599cf4251f3d files/2.3.2/glibc-2.3.2-mips-fix-nested-entend-pairs.patch 612
+MD5 048d54dd8fc9e895cac6b1b53de4b730 files/2.3.2/posix_fadvise64.c 2752
+MD5 cd0306085902d8629f2a77061cacdfd2 files/2.3.2/glibc-2.3.2-ia64-LOAD_ARGS-fixup.patch 4445
 MD5 d21659e6aa8802290d6734ec118bbb81 files/2.3.2/glibc-2.3.2-mips-pread-linux2.5.patch 5310
-MD5 f62924cbf762eb230514a9859522f5e7 files/2.3.2/glibc-2.3.2-nptl-fix-include.patch 247
-MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.2/glibc-2.3.2-owl-malloc-unlink-sanity-check.diff 1425
+MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch 1077
 MD5 578d3e5ff83cca218279a7a094fd0dad files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch 5107
-MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.2/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
+MD5 a505a59f53c5e068728d0aba44007a10 files/2.3.2/glibc-2.3.2-gcc33-sscanf.patch 671
 MD5 b27417338a4cd9906e2917701f0be575 files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch 5069
+MD5 cfce14f1f90a3903ed076a5209198ce5 files/2.3.2/glibc-2.3.2-armformat.patch 416
+MD5 bfb5e3c2c46359a8c426e98fe0e39838 files/2.3.2/glibc-2.3.2-mips-add-n32-n64-sysdep-cancel.patch 6344
+MD5 2f6605aae9bc4e538af783c0b2be3a7f files/2.3.2/glibc-2.3.2-decc-compaq.patch 1422
+MD5 45b1fda5b64866e837a825d0add0b31c files/2.3.2/glibc-2.3.2-ipv6-bytestring-fix.patch 4088
+MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.2/glibc-2.3.2-frandom-detect.patch 1770
+MD5 afa967d5fea8e467dda9c588f5600ed1 files/2.3.2/glibc-2.3.2-amd64-nomultilib.patch 506
+MD5 8d75a288ff9aa450717048b43497c82c files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch 1945
+MD5 4e99301d9cb2865f14d82595f3b7bc0a files/2.3.2/glibc-2.3.2-mips-fix-n32-n64-sysdep-headers.patch 4398
+MD5 026be2442305eef0a3e3ff897a14768e files/2.3.2/glibc-2.3.2-framestate-USING_SJLJ_EXCEPTIONS.patch 440
+MD5 d7097bf7fe910f2cba6ec69f86eb1958 files/2.3.2/glibc-2.3.2-alpha-sysdeps.patch 939
+MD5 15ac94e1ccc48f31120960dfe006818a files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch 2262
 MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.2/glibc-2.3.2-pt_pax.diff 1470
-MD5 ba477be20da9885349e4599de7a08c18 files/2.3.2/glibc-2.3.2-redhat-linuxthreads-fixes.patch 2532
-MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch 1077
-MD5 3d32067de612f477862e9b24c158a7ce files/2.3.2/glibc-2.3.2-rtld-assert-fix.patch 1153
-MD5 3eeb5a5b2f01b1fdb7a4af923e5b0cec files/2.3.2/glibc-2.3.2-s390-deprecated-ustat-fixup.patch 6638
+MD5 523558956091d4ffcd33b72c57ac4bac files/2.3.2/glibc-2.3.2-arm-bus-defines.patch 276
 MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.2/glibc-2.3.2-signal-ssp.diff 1431
 MD5 0e3ced9c3c484f502dcade7ffffa15f4 files/2.3.2/ssp.c 3935
-MD5 250d09cb52d2c3c7f6b0c4e0a1bf47f2 files/2.3.2/sysmacros.h 2443
-MD5 048d54dd8fc9e895cac6b1b53de4b730 files/2.3.2/posix_fadvise64.c 2752
-MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
-MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791
-MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770
-MD5 ec83f3d86f23243a1fb334b8872d454f files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329
-MD5 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/glibc-2.3.3-mips-addabi.diff 1720
-MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/glibc-2.3.3-mips-nolib3264.diff 1166
-MD5 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/glibc-2.3.3-mips-semtimedop.diff 602
-MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/glibc-2.3.3-mips-syscall.h.diff 1199
-MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/glibc-2.3.3-mips-sysify.diff 2138
-MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff 1425
-MD5 ff0a2716aebc6fb8a2e3b3f2c9be8bba files/2.3.3/glibc-2.3.3-tempfile.patch 1787
-MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.3/glibc-2.3.3_pre20040117-got-fix.diff 752
-MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff 1470
-MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff 1431
-MD5 86626ba8df9cac083bb3e1cfe23ec07e files/2.3.3/glibc-2.3.3_pre20040420-mips-dl-machine-calls.diff 1497
-MD5 ab91cb5bad07e1e79f990d4933741d42 files/2.3.3/glibc-2.3.3_pre20040420-mips-incl-sgidefs.diff 8287
-MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
+MD5 04bcec718f2883f28bf862b7e390d1b0 files/2.3.5/glibc-2.3.5-frandom-detect.patch 3080
+MD5 13dd059e6383c7cac94d1bda126af21d files/2.3.5/glibc-2.3.5-propolice-guard-functions.patch 1302
+MD5 b3ce53b86060b6209a182366c501a0f1 files/2.3.5/ssp.c 4297
+MD5 7fca8a203196513f13e519903dedbfd5 files/2.3.4/glibc-2.3.4-getcontext.patch 9854
+MD5 039f62650037a4a15cef3066b26d27c9 files/2.3.4/glibc-2.3.4-mips-update-__throw.patch 1975
+MD5 03b2b9cfe46d287c2a28df70e7a9e9a1 files/2.3.4/glibc-2.3.4-mips-prot_grows-undefined.patch 1410
+MD5 1974267b1382fb38be7495b12c847f70 files/2.3.4/glibc-2.3.4-fedora-branch-nomalloccheck.patch 372
 MD5 9db90105eb74d75834d25a599cba97ea files/2.3.4/glibc-2.3.3-mdns-resolver2.diff 12272
-MD5 89a6d0d924c8b05c4e06bdffb7c69b41 files/2.3.4/glibc-2.3.4-arm-ioperm.patch 4037
-MD5 9ee1438ba6ac30363130330c996dbb84 files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch 1443
-MD5 d902a9d990ee2970dd55dd805f352fa7 files/2.3.4/glibc-2.3.4-features-header-fix.patch 449
-MD5 ad71dc5c3f84f026c6e28865b2e90fbb files/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch 2337
 MD5 973e31ce24c9622234c4293b367de6b3 files/2.3.4/glibc-2.3.4-fedora-branch-no-libnoversion.patch 2288
-MD5 1974267b1382fb38be7495b12c847f70 files/2.3.4/glibc-2.3.4-fedora-branch-nomalloccheck.patch 372
-MD5 7fca8a203196513f13e519903dedbfd5 files/2.3.4/glibc-2.3.4-getcontext.patch 9854
-MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
-MD5 659a9d64935d67a5938d0cb4e5fe4899 files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch 2310
-MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
-MD5 076484ade8a834efb73190b687196392 files/2.3.4/glibc-2.3.4-mdns-resolver-20041102.diff 12809
+MD5 d902a9d990ee2970dd55dd805f352fa7 files/2.3.4/glibc-2.3.4-features-header-fix.patch 449
 MD5 41cec3deb89ffdbd670024a2b615b819 files/2.3.4/glibc-2.3.4-mips-add-missing-sgidefs_h.patch 1196
+MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304
 MD5 d490f38bd9ca9c48a9799f1e48629f6e files/2.3.4/glibc-2.3.4-mips-generate-syscall_h.patch 8230
-MD5 03b2b9cfe46d287c2a28df70e7a9e9a1 files/2.3.4/glibc-2.3.4-mips-prot_grows-undefined.patch 1410
-MD5 8d43dc97fe220048ade220f23e84f006 files/2.3.4/glibc-2.3.4-mips-rtld_deepbind-undefined.patch 1425
-MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/glibc-2.3.4-mips-sysdep-cancel.diff 2402
-MD5 039f62650037a4a15cef3066b26d27c9 files/2.3.4/glibc-2.3.4-mips-update-__throw.patch 1975
 MD5 207e313566b3fc24e0a5ca2ffd2da1d9 files/2.3.4/glibc-2.3.4-nptl-altivec.patch 6140
-MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304
-MD5 fe21fd44628b90f50e5024462cf4c348 files/2.3.4/glibc-2.3.4-res_init.patch 3417
-MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff 4203
+MD5 659a9d64935d67a5938d0cb4e5fe4899 files/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch 2310
+MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
 MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
-MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
-MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 MD5 b80890f83185acef8aeff622a1574e0b files/2.3.4/glibc-2.3.4-fix-_dl_next_tls_modid-assert.patch 9140
-MD5 ee692cfc6e7c810a2785093948638bbc files/2.3.4/glibc234-alpha-xstat.patch 7653
+MD5 340825c77e38e88e0ceaa12f154cbfa3 files/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff 4203
+MD5 89a6d0d924c8b05c4e06bdffb7c69b41 files/2.3.4/glibc-2.3.4-arm-ioperm.patch 4037
+MD5 b72e5aca6d834026a6f5fb87623e6fd3 files/2.3.4/host.conf 1302
 MD5 76185820806d5641f0314281ceb4790b files/2.3.4/hppa-no-pie.patch 1265
+MD5 ad71dc5c3f84f026c6e28865b2e90fbb files/2.3.4/glibc-2.3.4-fedora-branch-no-force-nontls.patch 2337
+MD5 ee692cfc6e7c810a2785093948638bbc files/2.3.4/glibc234-alpha-xstat.patch 7653
+MD5 fe21fd44628b90f50e5024462cf4c348 files/2.3.4/glibc-2.3.4-res_init.patch 3417
+MD5 9ee1438ba6ac30363130330c996dbb84 files/2.3.4/glibc-2.3.4-dl_execstack-PaX-support.patch 1443
+MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
+MD5 bbe355d94c5a36e11f543d12b70b5702 files/2.3.4/glibc-sec-hotfix-20040916.patch 3080
+MD5 8d43dc97fe220048ade220f23e84f006 files/2.3.4/glibc-2.3.4-mips-rtld_deepbind-undefined.patch 1425
+MD5 076484ade8a834efb73190b687196392 files/2.3.4/glibc-2.3.4-mdns-resolver-20041102.diff 12809
+MD5 1185022e9a50560d1bf9116a0461e011 files/2.3.4/glibc-2.3.4-mips-sysdep-cancel.diff 2402
+MD5 d84791059f1b4e7b157b3bbefe783208 files/2.3.1/glibc-2.3.1-stack_end-compat.patch 751
+MD5 f15c6dec40cefa86dae48a7dcb3b779a files/2.3.1/glibc-2.3.1-librt-mips.patch 396
+MD5 67b125cec4f1f0d26ce4df706451fee6 files/2.3.1/glibc-2.3.1-fpu-cw-mips.patch 433
+MD5 1c4e567ed001f9489e11ee06c1ced0b7 files/2.3.1/glibc-2.3.1-libc_wait-compat.patch 1053
+MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
+MD5 dc18731db5bd28b8bd2074fc9177fd35 files/2.3.1/glibc23-07-hppa-atomicity.dpatch 2519
+MD5 23bbb51d1008f3009e6f1867b284c9bc files/2.3.1/glibc-2.3.1-libgcc-compat-mips.patch 5222
+MD5 1b5df7c58ad160593192704cece47347 files/2.3.3/glibc-2.3.3-dl_execstack-PaX-support.patch 1791
+MD5 0e27dbd2a3b85a0e14625294296fad9a files/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch 1986
+MD5 ca1d4648f72e5fea2858fdb6ea3d39a0 files/2.3.3/glibc-2.3.3-mips-addabi.diff 1720
+MD5 ff0a2716aebc6fb8a2e3b3f2c9be8bba files/2.3.3/glibc-2.3.3-tempfile.patch 1787
+MD5 7b6054c2e8ec654341690586bc2028c5 files/2.3.3/glibc-2.3.3_pre20040117-signal-ssp.diff 1431
+MD5 86626ba8df9cac083bb3e1cfe23ec07e files/2.3.3/glibc-2.3.3_pre20040420-mips-dl-machine-calls.diff 1497
+MD5 62f7e62583aaa70645d9c847b6a84299 files/2.3.3/glibc-2.3.3-frandom-detect.patch 1770
+MD5 81d95470c5766e56e27ad8b6967d2a16 files/2.3.3/glibc-2.3.3-mips-semtimedop.diff 602
+MD5 ab91cb5bad07e1e79f990d4933741d42 files/2.3.3/glibc-2.3.3_pre20040420-mips-incl-sgidefs.diff 8287
+MD5 84fa9a725c22975d735a2f91543a5cca files/2.3.3/glibc-2.3.3-mips-sysify.diff 2138
+MD5 a3eb98943bc9db66df33bfc08dea4c2e files/2.3.3/glibc-2.3.3_pre20040117-pt_pax.diff 1470
+MD5 847afe57e19abff1d5c49f6bb7084a3d files/2.3.3/glibc-2.3.3-mips-syscall.h.diff 1199
+MD5 f9343413b90877edfcaeedf89b3dec77 files/2.3.3/glibc-2.3.3-mips-nolib3264.diff 1166
+MD5 ec83f3d86f23243a1fb334b8872d454f files/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch 2329
+MD5 0bfc56be86acec8ec52fe29249e267a4 files/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff 1425
+MD5 175bde9b0017d4deb63cf55f38173e11 files/2.3.3/glibc-2.3.3_pre20040117-got-fix.diff 752
+MD5 ae9425cd4199cccd69c6d22633583dc1 files/2.3.3/ssp.c 4041
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDH0n/ArHZZzCEUG0RAmtSAJ9xppS1z6WLKz9D+0lkEFRkcZzIRgCfUkft
-qP5W2n+qtY+UyP0VrrnXAEg=
-=xIgn
+iD8DBQFDKigkgIKl8Uu19MoRAu0bAJ9nvzZI/UsdurPrXccUye4xXlPs6ACbBsmx
+CIDMrWSCeSRm/xTSiTzCOQI=
+=WbMK
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild b/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild
index de9e0c28055f..bf8ff383b759 100644
--- a/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild,v 1.2 2005/07/26 22:20:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20041102-r2.ebuild,v 1.3 2005/09/16 02:03:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -245,8 +245,15 @@ toolchain-glibc_src_unpack() {
 
 toolchain-glibc_src_compile() {
 	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
 	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
 
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
 	# -fomit-frame-pointer gets stripped in setup_flags, so we do this
 	# now to cache the value
 	want_omitfp
@@ -616,7 +623,7 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
@@ -624,7 +631,7 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
@@ -994,33 +1001,10 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
@@ -1033,13 +1017,13 @@ crosscompile_setup() {
 
 		case ${CTARGET} in
 			x86_64*)
-				export CFLAGS_x86="${CFLAGS_x86--m32}"
-				export CHOST_x86="i686-pc-linux-gnu"
+				export CFLAGS_x86=${CFLAGS_x86--m32}
+				export CHOST_x86=${CTARGET/x86_64/i686}
 				export CDEFINE_x86="__i386__"
 				export LIBDIR_x86="lib"
 
-				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-				export CHOST_amd64="x86_64-pc-linux-gnu"
+				export CFLAGS_amd64=${CFLAGS_amd64--m64}
+				export CHOST_amd64=${CTARGET}
 				export CDEFINE_amd64="__x86_64__"
 				export LIBDIR_amd64="lib64"
 
@@ -1047,18 +1031,18 @@ crosscompile_setup() {
 				export DEFAULT_ABI="amd64"
 			;;
 			mips64*)
-				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-				export CHOST_o32="mips-unknown-linux-gnu"
+				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+				export CHOST_o32=${CTARGET/mips64/mips}
 				export CDEFINE_o32="_ABIO32"
 				export LIBDIR_o32="lib"
 
-				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-				export CHOST_n32="mips64-unknown-linux-gnu"
+				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+				export CHOST_n32=${CTARGET}
 				export CDEFINE_n32="_ABIN32"
 				export LIBDIR_n32="lib32"
 
-				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-				export CHOST_n64="mips64-unknown-linux-gnu"
+				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+				export CHOST_n64=${CTARGET}
 				export CDEFINE_n64="_ABI64"
 				export LIBDIR_n64="lib64"
 
@@ -1066,13 +1050,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="n32"
 			;;
 			powerpc64*)
-				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-				export CHOST_ppc="powerpc-unknown-linux-gnu"
+				export CFLAGS_ppc=${CFLAGS_ppc--m32}
+				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
 				export CDEFINE_ppc="!__powerpc64__"
 				export LIBDIR_ppc="lib"
 
-				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
+				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+				export CHOST_ppc64=${CTARGET}
 				export CDEFINE_ppc64="__powerpc64__"
 				export LIBDIR_ppc64="lib64"
 
@@ -1080,13 +1064,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="ppc64"
 			;;
 			sparc64*)
-				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
-				export CHOST_sparc32="sparc-unknown-linux-gnu"
+				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
+				export CHOST_sparc32=${CTARGET/sparc64/sparc}
 				export CDEFINE_sparc32="!__arch64__"
 				export LIBDIR_sparc32="lib"
 
-				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-				export CHOST_sparc64="sparc64-unknown-linux-gnu"
+				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+				export CHOST_sparc64=${CTARGET}
 				export CDEFINE_sparc64="__arch64__"
 				export LIBDIR_sparc64="lib64"
 
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
index c97d58411c49..ae21d83a3dc2 100644
--- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.58 2005/08/13 03:54:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.59 2005/09/16 02:03:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -229,8 +229,15 @@ toolchain-glibc_src_unpack() {
 
 toolchain-glibc_src_compile() {
 	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
 	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
 
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
 	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
@@ -605,7 +612,7 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
@@ -613,7 +620,7 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
@@ -914,7 +921,8 @@ fix_lib64_symlinks() {
 		rm ${ROOT}/lib64
 		# now that lib64 is gone, nothing will run without calling ld.so
 		# directly. luckily the window of brokenness is almost non-existant
-		/lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use amd64 && /lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		use ppc64 && /lib/ld64.so.1 /bin/mv ${ROOT}/lib ${ROOT}/lib64
 		# all better :)
 		ldconfig
 		ln -s lib64 ${ROOT}/lib
@@ -938,33 +946,10 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
@@ -977,13 +962,13 @@ crosscompile_setup() {
 
 		case ${CTARGET} in
 			x86_64*)
-				export CFLAGS_x86="${CFLAGS_x86--m32}"
-				export CHOST_x86="i686-pc-linux-gnu"
+				export CFLAGS_x86=${CFLAGS_x86--m32}
+				export CHOST_x86=${CTARGET/x86_64/i686}
 				export CDEFINE_x86="__i386__"
 				export LIBDIR_x86="lib"
 
-				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-				export CHOST_amd64="x86_64-pc-linux-gnu"
+				export CFLAGS_amd64=${CFLAGS_amd64--m64}
+				export CHOST_amd64=${CTARGET}
 				export CDEFINE_amd64="__x86_64__"
 				export LIBDIR_amd64="lib64"
 
@@ -991,18 +976,18 @@ crosscompile_setup() {
 				export DEFAULT_ABI="amd64"
 			;;
 			mips64*)
-				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-				export CHOST_o32="mips-unknown-linux-gnu"
+				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+				export CHOST_o32=${CTARGET/mips64/mips}
 				export CDEFINE_o32="_ABIO32"
 				export LIBDIR_o32="lib"
 
-				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-				export CHOST_n32="mips64-unknown-linux-gnu"
+				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+				export CHOST_n32=${CTARGET}
 				export CDEFINE_n32="_ABIN32"
 				export LIBDIR_n32="lib32"
 
-				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-				export CHOST_n64="mips64-unknown-linux-gnu"
+				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+				export CHOST_n64=${CTARGET}
 				export CDEFINE_n64="_ABI64"
 				export LIBDIR_n64="lib64"
 
@@ -1010,13 +995,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="n32"
 			;;
 			powerpc64*)
-				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-				export CHOST_ppc="powerpc-unknown-linux-gnu"
-				export CDEFINE_ppc="__powerpc__"
+				export CFLAGS_ppc=${CFLAGS_ppc--m32}
+				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
+				export CDEFINE_ppc="!__powerpc64__"
 				export LIBDIR_ppc="lib"
 
-				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
+				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+				export CHOST_ppc64=${CTARGET}
 				export CDEFINE_ppc64="__powerpc64__"
 				export LIBDIR_ppc64="lib64"
 
@@ -1024,13 +1009,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="ppc64"
 			;;
 			sparc64*)
-				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
-				export CHOST_sparc32="sparc-unknown-linux-gnu"
+				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
+				export CHOST_sparc32=${CTARGET/sparc64/sparc}
 				export CDEFINE_sparc32="!__arch64__"
 				export LIBDIR_sparc32="lib"
 
-				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-				export CHOST_sparc64="sparc64-unknown-linux-gnu"
+				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+				export CHOST_sparc64=${CTARGET}
 				export CDEFINE_sparc64="__arch64__"
 				export LIBDIR_sparc64="lib64"
 
diff --git a/sys-libs/glibc/glibc-2.3.5-r1.ebuild b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
index cb512551b036..d544713f4451 100644
--- a/sys-libs/glibc/glibc-2.3.5-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.25 2005/09/07 20:13:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r1.ebuild,v 1.26 2005/09/16 02:03:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -218,19 +218,26 @@ toolchain-glibc_src_unpack() {
 
 toolchain-glibc_src_compile() {
 	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
 	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
 
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
 	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
-		make PARALLELMFLAGS="-j1" ${MAKEFLAGS} || die
+		make PARALLELMFLAGS="${MAKEOPTS} -j1" ${MAKEFLAGS} || die
 	fi
 	if want_nptl ; then
 		# ... and then do the optional nptl build
 		unset LD_ASSUME_KERNEL || :
 		glibc_do_configure nptl
 		einfo "Building GLIBC with NPTL..."
-		make PARALLELMFLAGS="-j1" ${MAKEFLAGS} || die
+		make PARALLELMFLAGS="${MAKEOPTS} -j1" ${MAKEFLAGS} || die
 	fi
 }
 
@@ -593,7 +600,7 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
@@ -601,7 +608,7 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
@@ -951,33 +958,10 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
@@ -990,13 +974,13 @@ crosscompile_setup() {
 
 		case ${CTARGET} in
 			x86_64*)
-				export CFLAGS_x86="${CFLAGS_x86--m32}"
-				export CHOST_x86="i686-pc-linux-gnu"
+				export CFLAGS_x86=${CFLAGS_x86--m32}
+				export CHOST_x86=${CTARGET/x86_64/i686}
 				export CDEFINE_x86="__i386__"
 				export LIBDIR_x86="lib"
 
-				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-				export CHOST_amd64="x86_64-pc-linux-gnu"
+				export CFLAGS_amd64=${CFLAGS_amd64--m64}
+				export CHOST_amd64=${CTARGET}
 				export CDEFINE_amd64="__x86_64__"
 				export LIBDIR_amd64="lib64"
 
@@ -1004,18 +988,18 @@ crosscompile_setup() {
 				export DEFAULT_ABI="amd64"
 			;;
 			mips64*)
-				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-				export CHOST_o32="mips-unknown-linux-gnu"
+				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+				export CHOST_o32=${CTARGET/mips64/mips}
 				export CDEFINE_o32="_ABIO32"
 				export LIBDIR_o32="lib"
 
-				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-				export CHOST_n32="mips64-unknown-linux-gnu"
+				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+				export CHOST_n32=${CTARGET}
 				export CDEFINE_n32="_ABIN32"
 				export LIBDIR_n32="lib32"
 
-				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-				export CHOST_n64="mips64-unknown-linux-gnu"
+				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+				export CHOST_n64=${CTARGET}
 				export CDEFINE_n64="_ABI64"
 				export LIBDIR_n64="lib64"
 
@@ -1023,13 +1007,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="n32"
 			;;
 			powerpc64*)
-				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-				export CHOST_ppc="powerpc-unknown-linux-gnu"
+				export CFLAGS_ppc=${CFLAGS_ppc--m32}
+				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
 				export CDEFINE_ppc="!__powerpc64__"
 				export LIBDIR_ppc="lib"
 
-				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
+				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+				export CHOST_ppc64=${CTARGET}
 				export CDEFINE_ppc64="__powerpc64__"
 				export LIBDIR_ppc64="lib64"
 
@@ -1037,13 +1021,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="ppc64"
 			;;
 			sparc64*)
-				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
-				export CHOST_sparc32="sparc-unknown-linux-gnu"
+				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
+				export CHOST_sparc32=${CTARGET/sparc64/sparc}
 				export CDEFINE_sparc32="!__arch64__"
 				export LIBDIR_sparc32="lib"
 
-				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-				export CHOST_sparc64="sparc64-unknown-linux-gnu"
+				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+				export CHOST_sparc64=${CTARGET}
 				export CDEFINE_sparc64="__arch64__"
 				export LIBDIR_sparc64="lib64"
 
diff --git a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
index 975cc6078801..c9a661839247 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050421.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.32 2005/08/30 02:08:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050421.ebuild,v 1.33 2005/09/16 02:03:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -219,8 +219,15 @@ toolchain-glibc_src_unpack() {
 
 toolchain-glibc_src_compile() {
 	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
 	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
 
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
 	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
@@ -594,7 +601,7 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
@@ -602,7 +609,7 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
@@ -949,33 +956,10 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
@@ -988,13 +972,13 @@ crosscompile_setup() {
 
 		case ${CTARGET} in
 			x86_64*)
-				export CFLAGS_x86="${CFLAGS_x86--m32}"
-				export CHOST_x86="i686-pc-linux-gnu"
+				export CFLAGS_x86=${CFLAGS_x86--m32}
+				export CHOST_x86=${CTARGET/x86_64/i686}
 				export CDEFINE_x86="__i386__"
 				export LIBDIR_x86="lib"
 
-				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-				export CHOST_amd64="x86_64-pc-linux-gnu"
+				export CFLAGS_amd64=${CFLAGS_amd64--m64}
+				export CHOST_amd64=${CTARGET}
 				export CDEFINE_amd64="__x86_64__"
 				export LIBDIR_amd64="lib64"
 
@@ -1002,18 +986,18 @@ crosscompile_setup() {
 				export DEFAULT_ABI="amd64"
 			;;
 			mips64*)
-				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-				export CHOST_o32="mips-unknown-linux-gnu"
+				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+				export CHOST_o32=${CTARGET/mips64/mips}
 				export CDEFINE_o32="_ABIO32"
 				export LIBDIR_o32="lib"
 
-				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-				export CHOST_n32="mips64-unknown-linux-gnu"
+				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+				export CHOST_n32=${CTARGET}
 				export CDEFINE_n32="_ABIN32"
 				export LIBDIR_n32="lib32"
 
-				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-				export CHOST_n64="mips64-unknown-linux-gnu"
+				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+				export CHOST_n64=${CTARGET}
 				export CDEFINE_n64="_ABI64"
 				export LIBDIR_n64="lib64"
 
@@ -1021,13 +1005,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="n32"
 			;;
 			powerpc64*)
-				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-				export CHOST_ppc="powerpc-unknown-linux-gnu"
+				export CFLAGS_ppc=${CFLAGS_ppc--m32}
+				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
 				export CDEFINE_ppc="!__powerpc64__"
 				export LIBDIR_ppc="lib"
 
-				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
+				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+				export CHOST_ppc64=${CTARGET}
 				export CDEFINE_ppc64="__powerpc64__"
 				export LIBDIR_ppc64="lib64"
 
@@ -1035,13 +1019,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="ppc64"
 			;;
 			sparc64*)
-				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
-				export CHOST_sparc32="sparc-unknown-linux-gnu"
+				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
+				export CHOST_sparc32=${CTARGET/sparc64/sparc}
 				export CDEFINE_sparc32="!__arch64__"
 				export LIBDIR_sparc32="lib"
 
-				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-				export CHOST_sparc64="sparc64-unknown-linux-gnu"
+				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+				export CHOST_sparc64=${CTARGET}
 				export CDEFINE_sparc64="__arch64__"
 				export LIBDIR_sparc64="lib64"
 
diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
index a4689c99a62d..b09b8fae6803 100644
--- a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.11 2005/08/30 02:08:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.12 2005/09/16 02:03:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -224,8 +224,15 @@ toolchain-glibc_src_unpack() {
 
 toolchain-glibc_src_compile() {
 	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
 	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
 
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
 	if want_linuxthreads ; then
 		glibc_do_configure linuxthreads
 		einfo "Building GLIBC with linuxthreads..."
@@ -599,7 +606,7 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
@@ -607,7 +614,7 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
@@ -957,33 +964,10 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
@@ -996,13 +980,13 @@ crosscompile_setup() {
 
 		case ${CTARGET} in
 			x86_64*)
-				export CFLAGS_x86="${CFLAGS_x86--m32}"
-				export CHOST_x86="i686-pc-linux-gnu"
+				export CFLAGS_x86=${CFLAGS_x86--m32}
+				export CHOST_x86=${CTARGET/x86_64/i686}
 				export CDEFINE_x86="__i386__"
 				export LIBDIR_x86="lib"
 
-				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-				export CHOST_amd64="x86_64-pc-linux-gnu"
+				export CFLAGS_amd64=${CFLAGS_amd64--m64}
+				export CHOST_amd64=${CTARGET}
 				export CDEFINE_amd64="__x86_64__"
 				export LIBDIR_amd64="lib64"
 
@@ -1010,18 +994,18 @@ crosscompile_setup() {
 				export DEFAULT_ABI="amd64"
 			;;
 			mips64*)
-				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-				export CHOST_o32="mips-unknown-linux-gnu"
+				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+				export CHOST_o32=${CTARGET/mips64/mips}
 				export CDEFINE_o32="_ABIO32"
 				export LIBDIR_o32="lib"
 
-				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-				export CHOST_n32="mips64-unknown-linux-gnu"
+				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+				export CHOST_n32=${CTARGET}
 				export CDEFINE_n32="_ABIN32"
 				export LIBDIR_n32="lib32"
 
-				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-				export CHOST_n64="mips64-unknown-linux-gnu"
+				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+				export CHOST_n64=${CTARGET}
 				export CDEFINE_n64="_ABI64"
 				export LIBDIR_n64="lib64"
 
@@ -1029,13 +1013,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="n32"
 			;;
 			powerpc64*)
-				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-				export CHOST_ppc="powerpc-unknown-linux-gnu"
+				export CFLAGS_ppc=${CFLAGS_ppc--m32}
+				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
 				export CDEFINE_ppc="!__powerpc64__"
 				export LIBDIR_ppc="lib"
 
-				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
+				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+				export CHOST_ppc64=${CTARGET}
 				export CDEFINE_ppc64="__powerpc64__"
 				export LIBDIR_ppc64="lib64"
 
@@ -1043,13 +1027,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="ppc64"
 			;;
 			sparc64*)
-				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
-				export CHOST_sparc32="sparc-unknown-linux-gnu"
+				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
+				export CHOST_sparc32=${CTARGET/sparc64/sparc}
 				export CDEFINE_sparc32="!__arch64__"
 				export LIBDIR_sparc32="lib"
 
-				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-				export CHOST_sparc64="sparc64-unknown-linux-gnu"
+				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+				export CHOST_sparc64=${CTARGET}
 				export CDEFINE_sparc64="__arch64__"
 				export LIBDIR_sparc64="lib64"
 
diff --git a/sys-libs/glibc/glibc-2.3.5.ebuild b/sys-libs/glibc/glibc-2.3.5.ebuild
index 1a1d4b93e36c..fb82b5a03a16 100644
--- a/sys-libs/glibc/glibc-2.3.5.ebuild
+++ b/sys-libs/glibc/glibc-2.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.43 2005/08/30 02:08:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.ebuild,v 1.44 2005/09/16 02:03:57 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -225,8 +225,15 @@ toolchain-glibc_src_unpack() {
 
 toolchain-glibc_src_compile() {
 	# Set gconvdir to /usr/$(get_libdir)/gconv on archs with multiple ABIs
+	local MAKEFLAGS=""
 	has_multilib_profile && MAKEFLAGS="gconvdir=$(alt_usrlibdir)/gconv"
 
+	echo
+	for v in ABI CBUILD CHOST CTARGET CBUILD_OPT CTARGET_OPT CC CFLAGS ; do
+		einfo " $(printf '%15s' ${v}:)   ${!v}"
+	done
+	echo
+
 	# -fomit-frame-pointer gets stripped in setup_flags, so we do this
 	# now to cache the value
 	want_omitfp
@@ -597,7 +604,7 @@ alt_prefix() {
 
 alt_libdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /$(get_libdir)
 	fi
@@ -605,7 +612,7 @@ alt_libdir() {
 
 alt_usrlibdir() {
 	if is_crosscompile ; then
-		echo /usr/${CTARGET}/lib
+		echo /usr/${CTARGET}/$(get_libdir)
 	else
 		echo /usr/$(get_libdir)
 	fi
@@ -977,33 +984,10 @@ fix_lib64_symlinks() {
 }
 
 use_multilib() {
-	case $(tc-arch) in
-		sparc)
-			case ${CHOST} in
-				sparc64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		mips)
-			case ${CHOST} in
-				mips64*)
-					is_crosscompile || has_multilib_profile || use multilib
-					;;
-				*)
-					false
-					;;
-			esac
-		;;
-		amd64|ppc64)
-			is_crosscompile || has_multilib_profile || use multilib
-		;;
-		*)
-			false
-		;;
+	case ${CTARGET} in
+		sparc64*|mips64*|amd64|ppc64)
+			is_crosscompile || has_multilib_profile || use multilib ;;
+		*)  false ;;
 	esac
 }
 
@@ -1016,13 +1000,13 @@ crosscompile_setup() {
 
 		case ${CTARGET} in
 			x86_64*)
-				export CFLAGS_x86="${CFLAGS_x86--m32}"
-				export CHOST_x86="i686-pc-linux-gnu"
+				export CFLAGS_x86=${CFLAGS_x86--m32}
+				export CHOST_x86=${CTARGET/x86_64/i686}
 				export CDEFINE_x86="__i386__"
 				export LIBDIR_x86="lib"
 
-				export CFLAGS_amd64="${CFLAGS_amd64--m64}"
-				export CHOST_amd64="x86_64-pc-linux-gnu"
+				export CFLAGS_amd64=${CFLAGS_amd64--m64}
+				export CHOST_amd64=${CTARGET}
 				export CDEFINE_amd64="__x86_64__"
 				export LIBDIR_amd64="lib64"
 
@@ -1030,18 +1014,18 @@ crosscompile_setup() {
 				export DEFAULT_ABI="amd64"
 			;;
 			mips64*)
-				export CFLAGS_o32="${CFLAGS_o32--mabi=32}"
-				export CHOST_o32="mips-unknown-linux-gnu"
+				export CFLAGS_o32=${CFLAGS_o32--mabi=32}
+				export CHOST_o32=${CTARGET/mips64/mips}
 				export CDEFINE_o32="_ABIO32"
 				export LIBDIR_o32="lib"
 
-				export CFLAGS_n32="${CFLAGS_n32--mabi=n32}"
-				export CHOST_n32="mips64-unknown-linux-gnu"
+				export CFLAGS_n32=${CFLAGS_n32--mabi=n32}
+				export CHOST_n32=${CTARGET}
 				export CDEFINE_n32="_ABIN32"
 				export LIBDIR_n32="lib32"
 
-				export CFLAGS_n64="${CFLAGS_n64--mabi=64}"
-				export CHOST_n64="mips64-unknown-linux-gnu"
+				export CFLAGS_n64=${CFLAGS_n64--mabi=64}
+				export CHOST_n64=${CTARGET}
 				export CDEFINE_n64="_ABI64"
 				export LIBDIR_n64="lib64"
 
@@ -1049,13 +1033,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="n32"
 			;;
 			powerpc64*)
-				export CFLAGS_ppc="${CFLAGS_ppc--m32}"
-				export CHOST_ppc="powerpc-unknown-linux-gnu"
+				export CFLAGS_ppc=${CFLAGS_ppc--m32}
+				export CHOST_ppc=${CTARGET/powerpc64/powerpc}
 				export CDEFINE_ppc="!__powerpc64__"
 				export LIBDIR_ppc="lib"
 
-				export CFLAGS_ppc64="${CFLAGS_ppc64--m64}"
-				export CHOST_ppc64="powerpc64-unknown-linux-gnu"
+				export CFLAGS_ppc64=${CFLAGS_ppc64--m64}
+				export CHOST_ppc64=${CTARGET}
 				export CDEFINE_ppc64="__powerpc64__"
 				export LIBDIR_ppc64="lib64"
 
@@ -1063,13 +1047,13 @@ crosscompile_setup() {
 				export DEFAULT_ABI="ppc64"
 			;;
 			sparc64*)
-				export CFLAGS_sparc32="${CFLAGS_sparc--m32}"
-				export CHOST_sparc32="sparc-unknown-linux-gnu"
+				export CFLAGS_sparc32=${CFLAGS_sparc--m32}
+				export CHOST_sparc32=${CTARGET/sparc64/sparc}
 				export CDEFINE_sparc32="!__arch64__"
 				export LIBDIR_sparc32="lib"
 
-				export CFLAGS_sparc64="${CFLAGS_sparc64--m64}"
-				export CHOST_sparc64="sparc64-unknown-linux-gnu"
+				export CFLAGS_sparc64=${CFLAGS_sparc64--m64}
+				export CHOST_sparc64=${CTARGET}
 				export CDEFINE_sparc64="__arch64__"
 				export LIBDIR_sparc64="lib64"