[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc/files/4.4.0/, sys-devel/gcc/files/4.6.3/, ...

[Fabian Groffen]

tch sys-devel/gcc/files/gcc-4.8-aix-extref.patch sys-devel/gcc/files/gcc-4.8.2-linux-x86-on-amd64.patch sys-devel/gcc/files/gcc-4.8.4-aix-pthread-specs.patch sys-devel/gcc/files/gcc-4.8.4-aix-soname-libgcc.patch.xz sys-devel/gcc/files/gcc-4.8.4-aix-soname-libtool.patch.xz sys-devel/gcc/files/gcc-4.8.4-aix-soname-nm-weak.patch sys-devel/gcc/files/gcc-4.8.4-aix-soname-regen.patch.xz sys-devel/gcc/files/gcc-4.8.4-lowmem-build.patch sys-devel/gcc/files/gcc-5.3.0-libc_name_p.patch sys-devel/gcc/files/gcc-7.3.0-powerpc-darwin.patch sys-devel/gcc/files/gcj-4.3.1-iconvlink.patch sys-devel/gcc/files/interix-3.5-stdint.h sys-devel/gcc/files/mkinfodir sys-devel/gcc/files/pro-police-docs.patch sys-devel/gcc/files/scan_libgcc_linked_ssp.sh sys-devel/gcc/files/solaris-i386-ld-emulation.patch sys-devel/gcc/files/stubs/gcc-3.3-htb-stub.patch sys-devel/gcc/files/stubs/gcc-3.3-ssp-stub.patch sys-devel/gcc/files/stubs/gcc-3.4-htb-stub.patch sys-devel/gcc/files/stubs/gcc-3.4-ssp-stub.patch sys-devel/gcc
 /files/stubs/gcc-4.0-htb-stub.patch sys-devel/gcc/files/stubs/gcc-4.0-ssp-stub.patch sys-devel/gcc/gcc-5.4.0-r4.ebuild sys-devel/gcc/gcc-6.4.0-r2.ebuild sys-devel/gcc/metadata.xml
X-VCS-Directories: sys-devel/gcc/files/3.3.6/ sys-devel/gcc/files/4.3.0/ sys-devel/gcc/files/4.4.4/ sys-devel/gcc/files/ sys-devel/gcc/ sys-devel/gcc/files/4.5.1/ sys-devel/gcc/files/3.3.4/ sys-devel/gcc/files/3.4.4/ sys-devel/gcc/files/awk/ sys-devel/gcc/files/3.4.3/ sys-devel/gcc/files/stubs/ sys-devel/gcc/files/4.4.0/ sys-devel/gcc/files/4.6.3/
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: d55a710159791c2888f0677bb888e58cd57170ab
X-VCS-Branch: master
Date: Wed, 23 Dec 2020 09:08:41 +0000 (UTC)

commit:     d55a710159791c2888f0677bb888e58cd57170ab
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 23 09:08:19 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Dec 23 09:08:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d55a7101

sys-devel/gcc: cleanup patches

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-devel/gcc/Manifest                             |    4 -
 .../gcc/files/3.3.4/libffi-without-libgcj.patch    |   22 -
 .../gcc/files/3.3.6/gcc-3.3.6-cross-compile.patch  |   62 -
 .../files/3.4.3/libffi-nogcj-lib-path-fix.patch    |   40 -
 .../gcc/files/3.4.3/libffi-without-libgcj.patch    |   40 -
 sys-devel/gcc/files/3.4.3/libssp.patch             |   51 -
 sys-devel/gcc/files/3.4.4/aix-force-pthread.patch  |  231 ----
 sys-devel/gcc/files/3.4.4/aix-runtimelinking.patch |   33 -
 sys-devel/gcc/files/3.4.4/aix5300-08_ldcore.patch  |   10 -
 .../gcc/files/3.4.4/gcc-3.4.4-cross-compile.patch  |   63 -
 .../gcc/files/3.4.4/gcc-3.4.4-softfloat.patch      |  156 ---
 sys-devel/gcc/files/3.4.4/prefix-search-dirs.patch |   13 -
 sys-devel/gcc/files/4.3.0/solarisx86_64.patch      |  100 --
 sys-devel/gcc/files/4.3.0/targettools-checks.patch |   90 --
 .../gcc/files/4.3.0/treelang-nomakeinfo.patch      |   34 -
 .../gcc/files/4.4.0/gcc-4.4.0-softfloat.patch      |   89 --
 .../gcc/files/4.4.0/gcc-4.4.1-solaris-x86_64.patch |  125 --
 sys-devel/gcc/files/4.4.4/aix-bnoerok.patch        |   15 -
 sys-devel/gcc/files/4.5.1/aix-force-pthread.patch  |  282 -----
 sys-devel/gcc/files/4.5.1/gcc-4.5.1-mint1.patch    |   32 -
 .../gcc/files/4.5.1/ia64-hpux-always-pthread.patch |   22 -
 sys-devel/gcc/files/4.5.1/solaris-x86_64.patch     |  114 --
 sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint1.patch    |  335 ------
 sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint2.patch    | 1259 --------------------
 sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint3.patch    |   12 -
 sys-devel/gcc/files/4.6.3/solaris-x86_64.patch     |  215 ----
 sys-devel/gcc/files/awk/fixlafiles.awk             |  314 -----
 sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la   |  335 ------
 sys-devel/gcc/files/awk/scanforssp.awk             |  225 ----
 sys-devel/gcc/files/c89                            |   20 -
 sys-devel/gcc/files/c99                            |   21 -
 sys-devel/gcc/files/fix_libtool_files.sh           |   68 --
 sys-devel/gcc/files/gcc-3.4.6-aix-largefiles.patch |  271 -----
 .../files/gcc-4.2-ia64-hpux-always-pthread.patch   |   22 -
 .../files/gcc-4.2-pa-hpux-libgcc_s-soname.patch    |   12 -
 sys-devel/gcc/files/gcc-4.2.3-aix-largefiles.patch |  271 -----
 sys-devel/gcc/files/gcc-4.2.4-aix-largefiles.patch |  271 -----
 .../gcc/files/gcc-4.2.4-interix-all-source.patch   |   11 -
 .../gcc/files/gcc-4.2.4-interix-long-double.patch  |   15 -
 .../gcc/files/gcc-4.2.4-interix-x64-support.patch  |   16 -
 .../gcc/files/gcc-4.4.1-interix-avoid-bs.patch     |   51 -
 sys-devel/gcc/files/gcc-4.4.1-interix.patch        |  350 ------
 sys-devel/gcc/files/gcc-4.8-aix-extref.patch       |  102 --
 .../gcc/files/gcc-4.8.2-linux-x86-on-amd64.patch   |   34 -
 .../gcc/files/gcc-4.8.4-aix-pthread-specs.patch    |   47 -
 .../gcc/files/gcc-4.8.4-aix-soname-libgcc.patch.xz |  Bin 2508 -> 0 bytes
 .../files/gcc-4.8.4-aix-soname-libtool.patch.xz    |  Bin 5976 -> 0 bytes
 .../gcc/files/gcc-4.8.4-aix-soname-nm-weak.patch   |   40 -
 .../gcc/files/gcc-4.8.4-aix-soname-regen.patch.xz  |  Bin 10440 -> 0 bytes
 sys-devel/gcc/files/gcc-4.8.4-lowmem-build.patch   |   24 -
 sys-devel/gcc/files/gcc-5.3.0-libc_name_p.patch    |  111 --
 sys-devel/gcc/files/gcc-7.3.0-powerpc-darwin.patch |   30 -
 sys-devel/gcc/files/gcj-4.3.1-iconvlink.patch      |   17 -
 sys-devel/gcc/files/interix-3.5-stdint.h           |  301 -----
 sys-devel/gcc/files/mkinfodir                      |  233 ----
 sys-devel/gcc/files/pro-police-docs.patch          |   74 --
 sys-devel/gcc/files/scan_libgcc_linked_ssp.sh      |   42 -
 .../gcc/files/solaris-i386-ld-emulation.patch      |   36 -
 sys-devel/gcc/files/stubs/gcc-3.3-htb-stub.patch   |   59 -
 sys-devel/gcc/files/stubs/gcc-3.3-ssp-stub.patch   |   45 -
 sys-devel/gcc/files/stubs/gcc-3.4-htb-stub.patch   |   32 -
 sys-devel/gcc/files/stubs/gcc-3.4-ssp-stub.patch   |   44 -
 sys-devel/gcc/files/stubs/gcc-4.0-htb-stub.patch   |   32 -
 sys-devel/gcc/files/stubs/gcc-4.0-ssp-stub.patch   |   44 -
 sys-devel/gcc/gcc-5.4.0-r4.ebuild                  |    4 -
 sys-devel/gcc/gcc-6.4.0-r2.ebuild                  |   72 --
 sys-devel/gcc/metadata.xml                         |    2 -
 67 files changed, 7147 deletions(-)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7549317634..a1d6aa55a6 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -25,9 +25,6 @@ DIST gcc-5.4.0-patches-1.8.tar.bz2 32886 BLAKE2B 85879ba552ff21e198de568b2a1f254
 DIST gcc-5.4.0-piepatches-v0.6.5.tar.bz2 14551 BLAKE2B 6f3de9be0990a7580785821d8c85114a1907571c06bdf3a15ad91258f7c9e8bb6a4d2ddb8615f33bedf0ad036d215507e004fc095f788e40c824ae0ab3ffbb05 SHA512 4890f0713d261982ab81a20f93c5f65193aa1dfa171e3f9e5867f0b80ec7c1e76c5a997b1a4e6f47f8ce36af54ac91125c5bff8bf6d971b7d77c65a57a40a3c0
 DIST gcc-5.4.0-uclibc-patches-1.0.tar.bz2 3731 BLAKE2B fa436d1c1d9c150714092132f816740f8218dfeb4f9a6a8c830ea54d211a020f209e6fd1fcc313b2560b82c7855120053d346af72b7c12c88a7a948379dd2356 SHA512 009f34197e79c5e8c6497a0db01ac45cc657e92e56a663b4f3281661d108b2a129cd977fab5f0064f225d6812ae91e82bab22a2b10ae02c486881eeed85ec7a3
 DIST gcc-5.4.0.tar.bz2 95661481 BLAKE2B bf882acfa28cc1064cddd21e25332fff6bc65505d6af9acb2e455916edbc4f6b1de9b3524867f51d7819fc4f213ce21332fbf67cf71cd6c7b96fb8907e51d570 SHA512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b
-DIST gcc-6.4.0-patches-1.4.tar.bz2 13451 BLAKE2B 9934558989405141ae22c941fc4f5b4fb9dc425b0f35b458ab9c2704b8fbf61975a93c3d0e4c9ebde0cc7f935be868e9ad7ebdd78441235b81316fcca339fc42 SHA512 6d94f1ac196deabc8fcd30215bcbec4bbb19924929ef11c3000c8bfa189c59d87f95d37ac8cb0ff2d59cc2fc632b5767dbb80cbe7a354084cb2bc5e14cfbabb2
-DIST gcc-6.4.0-uclibc-patches-1.0.tar.bz2 1586 BLAKE2B 21f97a9e1c349b3d52def092a03e5a90533521da9af586be7ee527594f2d65745491ff8758d88c99a7ac215bde7ebf4e47a0a36cfcd7e66f70e0bebf2dadd922 SHA512 266dbe2bb53d892a24cd752d5c6833ea33f8df8b11b0471700ee53865243cd41f412f9bea8a369b474c9cd1435faff2e03902c7cb5638dd3ddcaa665aa2ec522
-DIST gcc-6.4.0.tar.xz 76156220 BLAKE2B 2018c338b28ea644cdd1b327cb0dfe7ee9aa2010357c93f7e71969f587c58d3fdfa2bb4c82a309490c48bc86924400022fa93f41dc6c4345878d1bc1d8204265 SHA512 02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90
 DIST gcc-7.4.0-patches-1.1.tar.bz2 8778 BLAKE2B 52b02b3c619b99912ee254599788abebe3963cf85e49b56166069318e340a8e271d767e82798e6062fc2a042a86a88da66ab95f2d9e42933ff17688d616a903f SHA512 02ec2eb2460e24cf46f7a04ca3b80ca120719389a54a740070e991d9c96b6fd55d1fa04eb4249fd3043edc9c0f6519b5babcce76036cd0146183512aaae2d573
 DIST gcc-7.4.0.tar.xz 62601888 BLAKE2B df91ec680d5389736d3a37a2d85cf2e12fbe87b642fdf4b332e67a043e00944aca00243cc6709f86abd92115cb5a78502146636395571d1ea4899531e15d5d0e SHA512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e
 DIST gcc-8.3.0-patches-1.0.tar.bz2 12278 BLAKE2B 793465c5de0af850c7f3017b3011e68f3bd1664e6ce3500a3dc3003d37c03fe81857698957770a135eadd395a7767fa804d354ecdcdeb1d83623280ca569d4ec SHA512 0efadd2481713992807fed2683666f1094b3757674754601c079569f3ef70cd7aed3cefc9f815f4e59a21d37e4e940c122df714e16f3878a5f966450c4273669
@@ -36,5 +33,4 @@ DIST gcc-9.2.0-patches-4.tar.bz2 21655 BLAKE2B 2acf6d83ec934a65e77d2079a024b4262
 DIST gcc-9.2.0.tar.xz 70607648 BLAKE2B 41a5e148f9a6857d6599679964c203533f76f330ad527fbe7c5e746d78f6f6f6d6d0f330a67cb1e794e155be8d1cd6e986bcc8a116d620dca410b78f0bcdd453 SHA512 a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
 DIST gcc-cygwinports-0de6b2ae6b6577eb0891a7ca8d551bdfa79bf5e8.tar.gz 20183 BLAKE2B dc9a4c78f98851ed77720d4c06d3fbf9f2d7d0e81a825cc89026994060fd29214f111fd3a52cec6518417cab2be89caf4a844a0869136287f174147ca7a6ebf3 SHA512 d01ee85a1327e7f6f16b3c2de6659699764f365215bd3e58247c5c65594153b9232bdc43ff89420cac75ad908ed39c7ff9fa4006818f5dd209b792d34d9ae7de
 DIST gcc-cygwinports-11fa2eec213324d64673ad41358f726f6523667f.tar.gz 23047 BLAKE2B 83e44a2eed9e134ea2531e3ecff4479f4d305a55d14729ed11c91199c1f56ec7e2d4df48d56de11ba43a9e936019943edc370a04a26f6b3bfd5616230feeffa5 SHA512 f8cbf3b2b20c1950d0984fe672536d92f7d05b065495d93205d72b7578e696847f074430c6e642668d1c0c26fa9d98a4dfd3fce7030d45f2d04f80499437587c
-DIST gcc-cygwinports-a03d77536f40d1a6335b6d313a4e4a4dff38ce66.tar.gz 35809 BLAKE2B e009012e86b83032a7d316580eddfc8f03dccdaa9f573ce9a0e80209ef545748c4c98388238bc22c6666394346d5d4d42d21bf964454a6c05da1f80cd95f6ada SHA512 989b3b0bc0c55715d7c87fa59f465d2af7042e052a5d01e9cdb26fd61e08504a596a604aa482438560e011b8ea5d015da75f172ea5c2ea5b9a90e8943f355734
 DIST gcc-cygwinports-f44d762eb3551ea0d81aa8e4b428bcb7caabb628.tar.gz 32780 BLAKE2B 364353bf379a2a950050148caf2cef86239f2418a98f72b3edec4cf56e43e7d07601f4d1ca8103c691ddddff0fca96a6a8c728e2e50bca373c34441bdc7505be SHA512 d5bc37965745fa32a3ddd357e658bd066d4aadf19eee7a30047f4dc6f47450d320e33cbbe4bf22fa6f5e30f7f41ec6ec3a250df56760a38df0f14fea3e34a83e

diff --git a/sys-devel/gcc/files/3.3.4/libffi-without-libgcj.patch b/sys-devel/gcc/files/3.3.4/libffi-without-libgcj.patch
deleted file mode 100644
index 507d42f00e..0000000000
--- a/sys-devel/gcc/files/3.3.4/libffi-without-libgcj.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.in.old	2004-06-26 07:01:06.000000000 +0200
-+++ configure.in	2004-06-26 07:02:55.000000000 +0200
-@@ -52,8 +52,7 @@
- host_tools="texinfo byacc flex bison binutils ld gas gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool grep diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils snavigator libtool gettext zip fastjar"
- 
- # libgcj represents the runtime libraries only used by gcj.
--libgcj="target-libffi \
--	target-boehm-gc \
-+libgcj="target-boehm-gc \
- 	target-zlib \
- 	target-qthreads \
- 	target-libjava"
-@@ -66,7 +65,8 @@
- 		target-newlib \
- 		${libstdcxx_version} \
- 		target-libf2c \
--		${libgcj}
-+		${libgcj} \
-+		target-libffi \
- 		target-libobjc"
- 
- # these tools are built using the target libs, and are intended to run only

diff --git a/sys-devel/gcc/files/3.3.6/gcc-3.3.6-cross-compile.patch b/sys-devel/gcc/files/3.3.6/gcc-3.3.6-cross-compile.patch
deleted file mode 100644
index ff9b42bf96..0000000000
--- a/sys-devel/gcc/files/3.3.6/gcc-3.3.6-cross-compile.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
---- gcc/configure.in
-+++ gcc/configure.in
-@@ -1276,8 +1276,9 @@
- # This prevents libgcc2 from containing any code which requires libc
- # support.
- inhibit_libc=
--if { test x$host != x$target && test "x$with_headers" = x &&
--     test "x$with_sysroot" = x ; } || test x$with_newlib = xyes ; then
-+if { { test x$host != x$target && test "x$with_sysroot" = x ; } ||
-+       test x$with_newlib = xyes ; } &&
-+     { test "x$with_headers" = x || test "x$with_headers" = xno ; } ; then
-        inhibit_libc=-Dinhibit_libc
- fi
- AC_SUBST(inhibit_libc)
---- gcc/configure
-+++ gcc/configure
-@@ -1276,8 +1276,9 @@
- # This prevents libgcc2 from containing any code which requires libc
- # support.
- inhibit_libc=
--if { test x$host != x$target && test "x$with_headers" = x &&
--     test "x$with_sysroot" = x ; } || test x$with_newlib = xyes ; then
-+if { { test x$host != x$target && test "x$with_sysroot" = x ; } ||
-+       test x$with_newlib = xyes ; } &&
-+     { test "x$with_headers" = x || test "x$with_headers" = xno ; } ; then
-        inhibit_libc=-Dinhibit_libc
- fi
- AC_SUBST(inhibit_libc)
---- gcc/config/alpha/linux.h
-+++ gcc/config/alpha/linux.h
-@@ -72,6 +72,7 @@
- /* Do code reading to identify a signal frame, and set the frame
-    state data appropriately.  See unwind-dw2.c for the structs.  */
- 
-+#ifndef inhibit_libc
- #ifdef IN_LIBGCC2
- #include <signal.h>
- #include <sys/ucontext.h>
-@@ -121,3 +122,4 @@
-     (FS)->retaddr_column = 64;						\
-     goto SUCCESS;							\
-   } while (0)
-+#endif /* inhibit_libc */
---- gcc/config/i386/linux.h
-+++ gcc/config/i386/linux.h
-@@ -240,6 +240,7 @@
- /* Do code reading to identify a signal frame, and set the frame
-    state data appropriately.  See unwind-dw2.c for the structs.  */
- 
-+#ifndef inhibit_libc
- #ifdef IN_LIBGCC2
- /* There's no sys/ucontext.h for some (all?) libc1, so no
-    signal-turned-exceptions for them.  There's also no configure-run for
-@@ -304,3 +305,4 @@
-   } while (0)
- #endif /* not USE_GNULIBC_1 */
- #endif /* IN_LIBGCC2 */
-+#endif /* inhibit_libc */

diff --git a/sys-devel/gcc/files/3.4.3/libffi-nogcj-lib-path-fix.patch b/sys-devel/gcc/files/3.4.3/libffi-nogcj-lib-path-fix.patch
deleted file mode 100644
index b5195e4e91..0000000000
--- a/sys-devel/gcc/files/3.4.3/libffi-nogcj-lib-path-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur gcc-3.4.3/libffi/Makefile.in gcc-3.4.3-ffi-fixes/libffi/Makefile.in
---- gcc-3.4.3/libffi/Makefile.in	2003-11-22 08:41:32.000000000 -0500
-+++ gcc-3.4.3-ffi-fixes/libffi/Makefile.in	2004-11-28 17:31:50.000000000 -0500
-@@ -89,7 +89,7 @@
- libffi_basedir = @libffi_basedir@
- tool_include_dir = @tool_include_dir@
- toolexecdir = @toolexecdir@
--toolexeclibdir = @toolexeclibdir@
-+toolexeclibdir = @toolexeclibdir@/@gcc_version@
- 
- AUTOMAKE_OPTIONS = cygnus
- 
-diff -ur gcc-3.4.3/libffi/configure gcc-3.4.3-ffi-fixes/libffi/configure
---- gcc-3.4.3/libffi/configure	2004-05-18 05:08:39.000000000 -0400
-+++ gcc-3.4.3-ffi-fixes/libffi/configure	2004-11-28 17:48:19.000000000 -0500
-@@ -3800,8 +3800,8 @@
-   toolexecdir='$(exec_prefix)/$(target_alias)'
-   toolexeclibdir='$(toolexecdir)/lib'
- else
--  toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
--  toolexeclibdir='$(libdir)'
-+  toolexecdir='$(libdir)/gcc/$(target_alias)'
-+  toolexeclibdir='$(libdir)/gcc/$(target_alias)/$(gcc-version)'
- fi
- multi_os_directory=`$CC -print-multi-os-directory`
- case $multi_os_directory in
-diff -ur gcc-3.4.3/libffi/configure.in gcc-3.4.3-ffi-fixes/libffi/configure.in
---- gcc-3.4.3/libffi/configure.in	2004-04-27 01:10:19.000000000 -0400
-+++ gcc-3.4.3-ffi-fixes/libffi/configure.in	2004-11-28 17:40:30.000000000 -0500
-@@ -225,8 +225,8 @@
-   toolexecdir='$(exec_prefix)/$(target_alias)'
-   toolexeclibdir='$(toolexecdir)/lib'
- else
--  toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
--  toolexeclibdir='$(libdir)'
-+  toolexecdir='$(libdir)/gcc/$(target_alias)'
-+  toolexeclibdir='$(libdir)/gcc/$(target_alias)/$(gcc_version)'
- fi
- multi_os_directory=`$CC -print-multi-os-directory`
- case $multi_os_directory in

diff --git a/sys-devel/gcc/files/3.4.3/libffi-without-libgcj.patch b/sys-devel/gcc/files/3.4.3/libffi-without-libgcj.patch
deleted file mode 100644
index b270a06ad8..0000000000
--- a/sys-devel/gcc/files/3.4.3/libffi-without-libgcj.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.in.orig	2004-08-03 00:53:36.000000000 +0200
-+++ configure.in	2004-08-03 00:52:35.000000000 +0200
-@@ -136,8 +136,7 @@
- host_tools="texinfo byacc flex bison binutils gas ld gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar"
- 
- # libgcj represents the runtime libraries only used by gcj.
--libgcj="target-libffi \
--	target-boehm-gc \
-+libgcj="target-boehm-gc \
- 	target-zlib \
- 	target-qthreads \
- 	target-libjava"
-@@ -150,6 +150,7 @@
- 		target-libstdc++-v3 \
- 		target-libf2c \
- 		${libgcj} \
-+		target-libffi \
- 		target-libobjc"
- 
- # these tools are built using the target libraries, and are intended to
---- configure~	2004-08-28 02:31:04.000000000 +0200
-+++ configure	2004-08-28 10:55:28.000000000 +0200
-@@ -876,8 +876,7 @@
- host_tools="texinfo byacc flex bison binutils gas ld gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar"
- 
- # libgcj represents the runtime libraries only used by gcj.
--libgcj="target-libffi \
--	target-boehm-gc \
-+libgcj="target-boehm-gc \
- 	target-zlib \
- 	target-qthreads \
- 	target-libjava"
-@@ -891,6 +890,7 @@
- 		target-libstdc++-v3 \
- 		target-libf2c \
- 		${libgcj} \
-+		target-libffi \
- 		target-libobjc"
- 
- # these tools are built using the target libraries, and are intended to

diff --git a/sys-devel/gcc/files/3.4.3/libssp.patch b/sys-devel/gcc/files/3.4.3/libssp.patch
deleted file mode 100644
index 0f9608a181..0000000000
--- a/sys-devel/gcc/files/3.4.3/libssp.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- gcc-3.4.3-ssp/gcc/gcc.c	2004-11-14 21:17:58.585438344 -0500
-+++ gcc-3.4.3-ssp-libssp/gcc/gcc.c	2004-11-21 13:28:43.699379520 -0500
-@@ -711,7 +711,17 @@
- static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
- static const char *asm_spec = ASM_SPEC;
- static const char *asm_final_spec = ASM_FINAL_SPEC;
-+
-+#if defined(_LIBSSP_PROVIDES_SSP_)
-+#if defined(EFAULT_PIE_SSP) || defined(EFAULT_SSP)
-+static const char *link_spec = LINK_SPEC " %{!fno-stack-protector|!fno-stack-protector-all:-lssp %{static: -lc}}";
-+#else
-+static const char *link_spec = LINK_SPEC " %{fstack-protector|fstack-protector-all:-lssp %{static: -lc}}";
-+#endif // defined(EFAULT_PIE_SSP) || defined(EFAULT_SSP)
-+#else 
- static const char *link_spec = LINK_SPEC;
-+#endif // defined(_LIBSSP_PROVIDES_SSP_)
-+
- static const char *lib_spec = LIB_SPEC;
- static const char *libgcc_spec = LIBGCC_SPEC;
- static const char *endfile_spec = ENDFILE_SPEC;
-diff -Nru gcc-3.4.3-ssp/gcc/libgcc-std.ver gcc-3.4.3-ssp-libssp/gcc/libgcc-std.ver
---- gcc-3.4.3-ssp/gcc/libgcc-std.ver	2004-11-14 21:18:00.004222656 -0500
-+++ gcc-3.4.3-ssp-libssp/gcc/libgcc-std.ver	2004-11-15 19:22:11.802713352 -0500
-@@ -175,7 +175,7 @@
-   _Unwind_SjLj_ForcedUnwind
-   _Unwind_SjLj_Resume
- 
--%if !defined(_LIBC_PROVIDES_SSP_)
-+%if !defined(_LIBC_PROVIDES_SSP_) && !defined(_LIBSSP_PROVIDES_SSP_)
-   # stack smash handler symbols
-   __guard
-   __stack_smash_handler
-diff -Nru gcc-3.4.3-ssp/gcc/libgcc2.c gcc-3.4.3-ssp-libssp/gcc/libgcc2.c
---- gcc-3.4.3-ssp/gcc/libgcc2.c	2004-11-14 21:18:00.004222656 -0500
-+++ gcc-3.4.3-ssp-libssp/gcc/libgcc2.c	2004-11-15 19:24:58.428382400 -0500
-@@ -1680,7 +1680,7 @@
- 
- 
- #ifdef L_stack_smash_handler
--#ifndef _LIBC_PROVIDES_SSP_
-+#if !defined(_LIBC_PROVIDES_SSP_) && !defined(_LIBSSP_PROVIDES_SSP_)
- #include <stdio.h>
- #include <string.h>
- #include <fcntl.h>
-@@ -1797,5 +1797,5 @@
- #endif
-   _exit (127);
- }
--#endif /* _LIBC_PROVIDES_SSP_ */
-+#endif /* _LIBC_PROVIDES_SSP_ && _LIBSSP_PROVIDES_SSP_ */
- #endif /* L_stack_smash_handler */

diff --git a/sys-devel/gcc/files/3.4.4/aix-force-pthread.patch b/sys-devel/gcc/files/3.4.4/aix-force-pthread.patch
deleted file mode 100644
index b3a23ffa77..0000000000
--- a/sys-devel/gcc/files/3.4.4/aix-force-pthread.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-Because '-pthread' needs a different multilib library on AIX,
-always build with pthreads enabled, as we disable multilib in Prefix.
-Mixing pthread- and non-pthread-libs causes troubles anyway.
---- gcc/config/rs6000/aix41.h.orig	2009-04-03 09:01:40.000000000 +0200
-+++ gcc/config/rs6000/aix41.h	2009-04-03 09:14:09.000000000 +0200
-@@ -51,7 +51,7 @@
- #define CPP_SPEC "%{posix: -D_POSIX_SOURCE}\
-    %{ansi: -D_ANSI_C_SOURCE}\
-    %{mpe: -I/usr/lpp/ppe.poe/include}\
--   %{pthread: -D_THREAD_SAFE}"
-+   %{pthread} -D_THREAD_SAFE"
- 
- #undef TARGET_DEFAULT
- #define TARGET_DEFAULT MASK_NEW_MNEMONICS
-@@ -75,8 +75,8 @@
- #define LIB_SPEC "%{pg:-L/lib/profiled -L/usr/lib/profiled}\
-    %{p:-L/lib/profiled -L/usr/lib/profiled} %{!shared:%{g*:-lg}}\
-    %{mpe:-L/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
--   %{pthread: -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a}\
--   %{!pthread: -lc}"
-+   %{pthread:} -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a\
-+   "
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-@@ -89,8 +89,8 @@
-          %{!pg:%{p:/usr/lpp/ppe.poe/lib/mcrt0.o}\
-                %{!p:/usr/lpp/ppe.poe/lib/crt0.o}}}\
-    %{!mpe:\
--     %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
--     %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
-+     %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
-+     }}"
- 
- /* AIX 4 uses PowerPC nop (ori 0,0,0) instruction as call glue for PowerPC
-    and "cror 31,31,31" for POWER architecture.  */
---- gcc/config/rs6000/aix43.h.orig	2009-04-03 08:58:47.000000000 +0200
-+++ gcc/config/rs6000/aix43.h	2009-04-03 09:14:34.000000000 +0200
-@@ -116,7 +116,7 @@
-    %{ansi: -D_ANSI_C_SOURCE}\
-    %{maix64: -D__64BIT__}\
-    %{mpe: -I/usr/lpp/ppe.poe/include}\
--   %{pthread: -D_THREAD_SAFE}"
-+   %{pthread:} -D_THREAD_SAFE"
- 
- /* The GNU C++ standard library requires that these macros be 
-    defined.  */
-@@ -128,7 +128,7 @@
-    -D_ALL_SOURCE				\
-    %{maix64: -D__64BIT__}			\
-    %{mpe: -I/usr/lpp/ppe.poe/include}		\
--   %{pthread: -D_THREAD_SAFE}"
-+   %{pthread:} -D_THREAD_SAFE"
- 
- #undef TARGET_DEFAULT
- #define TARGET_DEFAULT MASK_NEW_MNEMONICS
-@@ -153,8 +153,8 @@
-    %{p:-L/lib/profiled -L/usr/lib/profiled}\
-    %{!maix64:%{!shared:%{g*:-lg}}}\
-    %{mpe:-L/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
--   %{pthread:-L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a}\
--   %{!pthread:-lc}"
-+   %{pthread:}-L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a\
-+   "
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-@@ -166,8 +166,8 @@
- #define STARTFILE_SPEC "%{!shared:\
-    %{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
-    %{!maix64:\
--     %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
--     %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
-+     %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
-+     }}"
- 
- /* AIX 4.3 typedefs ptrdiff_t as "long" while earlier releases used "int".  */
- 
---- gcc/config/rs6000/aix51.h.orig	2009-04-03 08:58:19.000000000 +0200
-+++ gcc/config/rs6000/aix51.h	2009-04-03 09:14:51.000000000 +0200
-@@ -117,7 +117,7 @@
-   %{ansi: -D_ANSI_C_SOURCE}			\
-   %{maix64: -D__64BIT__}			\
-   %{mpe: -I/usr/lpp/ppe.poe/include}		\
--  %{pthread: -D_THREAD_SAFE}"
-+  %{pthread:} -D_THREAD_SAFE"
- 
- /* The GNU C++ standard library requires that these macros be 
-    defined.  */
-@@ -129,7 +129,7 @@
-    -D_ALL_SOURCE				\
-    %{maix64: -D__64BIT__}			\
-    %{mpe: -I/usr/lpp/ppe.poe/include}		\
--   %{pthread: -D_THREAD_SAFE}"
-+   %{pthread:} -D_THREAD_SAFE"
- 
- #undef TARGET_DEFAULT
- #define TARGET_DEFAULT MASK_NEW_MNEMONICS
-@@ -154,7 +154,7 @@
-    %{p:-L/lib/profiled -L/usr/lib/profiled}\
-    %{!maix64:%{!shared:%{g*:-lg}}}\
-    %{mpe:-L/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
--   %{pthread:-lpthreads} -lc"
-+   %{pthread:}-lpthreads -lc"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-@@ -166,8 +166,8 @@
- #define STARTFILE_SPEC "%{!shared:\
-    %{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
-    %{!maix64:\
--     %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
--     %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
-+     %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
-+     }}"
- 
- /* AIX V5 typedefs ptrdiff_t as "long" while earlier releases used "int".  */
- 
---- gcc/config/rs6000/aix52.h.orig	2009-04-03 08:58:14.000000000 +0200
-+++ gcc/config/rs6000/aix52.h	2009-04-03 09:15:08.000000000 +0200
-@@ -105,7 +105,7 @@
-   %{ansi: -D_ANSI_C_SOURCE}			\
-   %{maix64: -D__64BIT__}			\
-   %{mpe: -I/usr/lpp/ppe.poe/include}		\
--  %{pthread: -D_THREAD_SAFE}"
-+  %{pthread:} -D_THREAD_SAFE"
- 
- /* The GNU C++ standard library requires that these macros be 
-    defined.  */
-@@ -117,7 +117,7 @@
-    -D_ALL_SOURCE				\
-    %{maix64: -D__64BIT__}			\
-    %{mpe: -I/usr/lpp/ppe.poe/include}		\
--   %{pthread: -D_THREAD_SAFE}"
-+   %{pthread:} -D_THREAD_SAFE"
- 
- #undef  TARGET_DEFAULT
- #define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS)
-@@ -146,7 +146,7 @@
-    %{p:-L/lib/profiled -L/usr/lib/profiled}\
-    %{!maix64:%{!shared:%{g*:-lg}}}\
-    %{mpe:-L/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
--   %{pthread:-lpthreads} -lc"
-+   %{pthread:}-lpthreads -lc"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-@@ -158,8 +158,8 @@
- #define STARTFILE_SPEC "%{!shared:\
-    %{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
-    %{!maix64:\
--     %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
--     %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
-+     %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
-+     }}"
- 
- /* AIX V5 typedefs ptrdiff_t as "long" while earlier releases used "int".  */
- 
---- gcc/config/rs6000/t-aix43.orig	2009-04-03 08:58:28.000000000 +0200
-+++ gcc/config/rs6000/t-aix43	2009-04-03 09:15:31.000000000 +0200
-@@ -10,13 +10,13 @@
- 	echo '#define FLOAT' > fp-bit.c
- 	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
- 
--# Build the libraries for pthread and all of the 
-+# Build the libraries for all of the 
- # different processor models
- 
--MULTILIB_OPTIONS	= pthread \
-+MULTILIB_OPTIONS	= \
- 			  mcpu=common/mcpu=power/mcpu=powerpc/maix64
- 
--MULTILIB_DIRNAMES	= pthread \
-+MULTILIB_DIRNAMES	= \
- 			  common power powerpc ppc64
- 
- MULTILIB_MATCHES	= mcpu?power=mcpu?power \
-@@ -47,7 +47,7 @@
- 	-Wl,-bE:@shlib_map_file@ -o @multilib_dir@/shr.o \
- 	@multilib_flags@ @shlib_objs@ -lc \
- 	`case @shlib_base_name@ in \
--	*pthread*) echo -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a ;; \
-+	*) echo -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a ;; \
- 	*) echo -lc ;; esac` ; \
- 	rm -f tmp-@shlib_base_name@.a ; \
- 	$(AR_CREATE_FOR_TARGET) tmp-@shlib_base_name@.a @multilib_dir@/shr.o ; \
-@@ -56,7 +56,7 @@
- # $(slibdir) double quoted to protect it from expansion while building
- # libgcc.mk.  We want this delayed until actual install time.
- SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.a $$(DESTDIR)$$(slibdir)/
--SHLIB_LIBS = -lc `case @shlib_base_name@ in *pthread*) echo -lpthread ;; esac`
-+SHLIB_LIBS = -lc `case @shlib_base_name@ in *) echo -lpthread ;; esac`
- SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
- SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/rs6000/libgcc-ppc64.ver
- SHLIB_NM_FLAGS = -Bpg -X32_64
---- gcc/config/rs6000/t-aix52.orig	2009-04-03 08:55:55.000000000 +0200
-+++ gcc/config/rs6000/t-aix52	2009-04-03 09:15:42.000000000 +0200
-@@ -10,12 +10,12 @@
- 	echo '#define FLOAT' > fp-bit.c
- 	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
- 
--# Build the libraries for pthread and all of the 
-+# Build the libraries for all of the 
- # different processor models
- 
--MULTILIB_OPTIONS	= pthread maix64
-+MULTILIB_OPTIONS	= maix64
- 
--MULTILIB_DIRNAMES	= pthread ppc64
-+MULTILIB_DIRNAMES	= ppc64
- 
- MULTILIB_MATCHES	= 
- 
-@@ -28,7 +28,7 @@
- 	-Wl,-bE:@shlib_map_file@ -o @multilib_dir@/shr.o \
- 	@multilib_flags@ @shlib_objs@ -lc \
- 	`case @shlib_base_name@ in \
--	*pthread*) echo -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a ;; \
-+	*) echo -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a ;; \
- 	*) echo -lc ;; esac` ; \
- 	rm -f tmp-@shlib_base_name@.a ; \
- 	$(AR_CREATE_FOR_TARGET) tmp-@shlib_base_name@.a @multilib_dir@/shr.o ; \
-@@ -37,7 +37,7 @@
- # $(slibdir) double quoted to protect it from expansion while building
- # libgcc.mk.  We want this delayed until actual install time.
- SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.a $$(DESTDIR)$$(slibdir)/
--SHLIB_LIBS = -lc `case @shlib_base_name@ in *pthread*) echo -lpthread ;; esac`
-+SHLIB_LIBS = -lc `case @shlib_base_name@ in *) echo -lpthread ;; esac`
- SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
- SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/rs6000/libgcc-ppc64.ver
- SHLIB_NM_FLAGS = -Bpg -X32_64

diff --git a/sys-devel/gcc/files/3.4.4/aix-runtimelinking.patch b/sys-devel/gcc/files/3.4.4/aix-runtimelinking.patch
deleted file mode 100644
index 055d1e36a6..0000000000
--- a/sys-devel/gcc/files/3.4.4/aix-runtimelinking.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- gcc/config/rs6000/aix43.h.orig	2009-05-04 16:28:08 +0200
-+++ gcc/config/rs6000/aix43.h	2009-05-04 16:28:29 +0200
-@@ -157,7 +157,7 @@
-    "
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-+#define LINK_SPEC "-brtl -bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-    %{static:-bnso %(link_syscalls) } %{shared:-bM:SRE %{!e:-bnoentry}}\
-    %{!maix64:%{!shared:%{g*: %(link_libg) }}} %{maix64:-b64}\
-    %{mpe:-binitfini:poe_remote_main}"
---- gcc/config/rs6000/aix51.h.orig	2009-05-04 16:28:12 +0200
-+++ gcc/config/rs6000/aix51.h	2009-05-04 16:28:32 +0200
-@@ -157,7 +157,7 @@
-    %{pthread:}-lpthreads -lc"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-+#define LINK_SPEC "-brtl -bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-    %{static:-bnso %(link_syscalls) } %{shared:-bM:SRE %{!e:-bnoentry}}\
-    %{!maix64:%{!shared:%{g*: %(link_libg) }}} %{maix64:-b64}\
-    %{mpe:-binitfini:poe_remote_main}"
---- gcc/config/rs6000/aix52.h.orig	2009-05-04 16:28:15 +0200
-+++ gcc/config/rs6000/aix52.h	2009-05-04 16:28:35 +0200
-@@ -149,7 +149,7 @@
-    %{pthread:}-lpthreads -lc"
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-+#define LINK_SPEC "-brtl -bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-    %{static:-bnso %(link_syscalls) } %{shared:-bM:SRE %{!e:-bnoentry}}\
-    %{!maix64:%{!shared:%{g*: %(link_libg) }}} %{maix64:-b64}\
-    %{mpe:-binitfini:poe_remote_main}"

diff --git a/sys-devel/gcc/files/3.4.4/aix5300-08_ldcore.patch b/sys-devel/gcc/files/3.4.4/aix5300-08_ldcore.patch
deleted file mode 100644
index ecf461ad24..0000000000
--- a/sys-devel/gcc/files/3.4.4/aix5300-08_ldcore.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gcc/config/rs6000/aix52.h.orig	2009-04-09 13:51:21 +0200
-+++ gcc/config/rs6000/aix52.h	2009-04-09 15:49:14 +0200
-@@ -150,6 +150,7 @@
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-brtl -bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-+   %{!shared:-bexpfull}\
-    %{static:-bnso %(link_syscalls) } %{shared:-bM:SRE %{!e:-bnoentry}}\
-    %{!maix64:%{!shared:%{g*: %(link_libg) }}} %{maix64:-b64}\
-    %{mpe:-binitfini:poe_remote_main}"

diff --git a/sys-devel/gcc/files/3.4.4/gcc-3.4.4-cross-compile.patch b/sys-devel/gcc/files/3.4.4/gcc-3.4.4-cross-compile.patch
deleted file mode 100644
index 03895434d9..0000000000
--- a/sys-devel/gcc/files/3.4.4/gcc-3.4.4-cross-compile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Some notes on the 'bootstrap with or without libc headers' debate:
-http://linuxfromscratch.org/pipermail/lfs-dev/2005-July/052409.html
-http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
-
---- gcc/config/sh/linux.h
-+++ gcc/config/sh/linux.h
-@@ -145,6 +145,7 @@
- /* Do code reading to identify a signal frame, and set the frame
-    state data appropriately.  See unwind-dw2.c for the structs.  */
- 
-+#ifndef inhibit_libc
- #ifdef IN_LIBGCC2
- #include <signal.h>
- #include <sys/ucontext.h>
-@@ -295,6 +296,7 @@
- 
- #endif /* defined (__SH5__) */
- #endif /* IN_LIBGCC2 */
-+#endif /* inhibit_libc */
- 
- /* For SH3 and SH4, we use a slot of the unwind frame which correspond
-    to a fake register number 16 as a placeholder for the return address
---- gcc/config/i386/linux.h
-+++ gcc/config/i386/linux.h
-@@ -208,6 +208,7 @@
- /* Do code reading to identify a signal frame, and set the frame
-    state data appropriately.  See unwind-dw2.c for the structs.  */
- 
-+#ifndef inhibit_libc
- #ifdef IN_LIBGCC2
- /* There's no sys/ucontext.h for some (all?) libc1, so no
-    signal-turned-exceptions for them.  There's also no configure-run for
-@@ -272,3 +273,4 @@
-   } while (0)
- #endif /* not USE_GNULIBC_1 */
- #endif /* IN_LIBGCC2 */
-+#endif /* inhibit_libc */
---- gcc/config/alpha/linux.h
-+++ gcc/config/alpha/linux.h
-@@ -73,6 +73,7 @@
- /* Do code reading to identify a signal frame, and set the frame
-    state data appropriately.  See unwind-dw2.c for the structs.  */
- 
-+#ifndef inhibit_libc
- #ifdef IN_LIBGCC2
- #include <signal.h>
- #include <sys/ucontext.h>
-@@ -122,3 +123,4 @@
-     (FS)->retaddr_column = 64;						\
-     goto SUCCESS;							\
-   } while (0)
-+#endif /* inhibit_libc */
---- gcc/config.gcc
-+++ gcc/config.gcc
-@@ -321,7 +321,7 @@
- 	need_64bit_hwint=yes
- 	;;
- # Note the 'l'; we need to be able to match e.g. "shle" or "shl".
--sh[123456789l]*-*-*)
-+sh[123456789lbe]*-*-*)
- 	cpu_type=sh
- 	need_64bit_hwint=yes
- 	;;

diff --git a/sys-devel/gcc/files/3.4.4/gcc-3.4.4-softfloat.patch b/sys-devel/gcc/files/3.4.4/gcc-3.4.4-softfloat.patch
deleted file mode 100644
index 9646bed637..0000000000
--- a/sys-devel/gcc/files/3.4.4/gcc-3.4.4-softfloat.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-The hunk for gcc/config/arm/t-linux comes from:
-http://gcc.gnu.org/PR14352
-
-The rest is a custom job by Yuri Vasilevski.
-
-The idea here is that we add soft float support into the spec file
-so that we don't have to worry about packages stripping out softfloat
-flags from CFLAGS/CXXFLAGS.
-
-http://bugs.gentoo.org/75585
-
---- gcc-3.4.4/gcc/config/arm/coff.h
-+++ gcc-3.4.4/gcc/config/arm/coff.h
-@@ -31,11 +31,16 @@
- #define TARGET_VERSION fputs (" (ARM/coff)", stderr)
- 
- #undef  TARGET_DEFAULT
--#define TARGET_DEFAULT (ARM_FLAG_SOFT_FLOAT | ARM_FLAG_APCS_32 | ARM_FLAG_APCS_FRAME | ARM_FLAG_MMU_TRAPS)
-+#define TARGET_DEFAULT		\
-+	( ARM_FLAG_SOFT_FLOAT	\
-+	| ARM_FLAG_VFP		\
-+	| ARM_FLAG_APCS_32	\
-+	| ARM_FLAG_APCS_FRAME	\
-+	| ARM_FLAG_MMU_TRAPS )
- 
- #ifndef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
--  { "marm", "mlittle-endian", "msoft-float", "mapcs-32", "mno-thumb-interwork" }
-+  { "marm", "mlittle-endian", "mapcs-32", "mno-thumb-interwork" }
- #endif
- 
- /* This is COFF, but prefer stabs.  */
---- gcc-3.4.4/gcc/config/arm/elf.h
-+++ gcc-3.4.4/gcc/config/arm/elf.h
-@@ -46,7 +46,9 @@
- 
- #ifndef SUBTARGET_ASM_FLOAT_SPEC
- #define SUBTARGET_ASM_FLOAT_SPEC "\
--%{mapcs-float:-mfloat} %{msoft-float:-mfpu=softfpa}"
-+%{mapcs-float:-mfloat} \
-+%{mhard-float:-mfpu=fpa} \
-+%{!mhard-float: %{msoft-float:-mfpu=softvfp} %{!msoft-float:-mfpu=softvfp}}"
- #endif
- 
- #ifndef ASM_SPEC
-@@ -106,12 +108,17 @@
- #endif
- 
- #ifndef TARGET_DEFAULT
--#define TARGET_DEFAULT (ARM_FLAG_SOFT_FLOAT | ARM_FLAG_APCS_32 | ARM_FLAG_APCS_FRAME | ARM_FLAG_MMU_TRAPS)
-+#define TARGET_DEFAULT		\
-+	(ARM_FLAG_SOFT_FLOAT	\
-+	| ARM_FLAG_VFP		\
-+	| ARM_FLAG_APCS_32	\
-+	| ARM_FLAG_APCS_FRAME	\
-+	| ARM_FLAG_MMU_TRAPS )
- #endif
- 
- #ifndef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
--  { "marm", "mlittle-endian", "msoft-float", "mapcs-32", "mno-thumb-interwork", "fno-leading-underscore" }
-+  { "marm", "mlittle-endian", "mapcs-32", "mno-thumb-interwork", "fno-leading-underscore" }
- #endif
- 
- #define TARGET_ASM_FILE_START_APP_OFF true
---- gcc-3.4.4/gcc/config/arm/linux-elf.h
-+++ gcc-3.4.4/gcc/config/arm/linux-elf.h
-@@ -44,20 +44,33 @@
- #define TARGET_LINKER_EMULATION "armelf_linux"
- #endif
- 
--/* Default is to use APCS-32 mode.  */
-+/*
-+ * Default is to use APCS-32 mode with soft-vfp.
-+ * The old Linux default for floats can be achieved with -mhard-float
-+ * or with the configure --with-float=hard option.
-+ * If -msoft-float or --with-float=soft is used then software float
-+ * support will be used just like the default but with the legacy
-+ * big endian word ordering for double float representation instead.
-+ */
- #undef  TARGET_DEFAULT
- #define TARGET_DEFAULT \
- 		( ARM_FLAG_APCS_32 | \
-+		  ARM_FLAG_SOFT_FLOAT | \
-+		  ARM_FLAG_VFP | \
- 		  ARM_FLAG_MMU_TRAPS | \
- 		  TARGET_ENDIAN_DEFAULT )
- 
-+#undef  SUBTARGET_EXTRA_ASM_SPEC
-+#define SUBTARGET_EXTRA_ASM_SPEC "%{mhard-float:-mfpu=fpa} \
-+%{!mhard-float: %{msoft-float:-mfpu=softvfp} %{!msoft-float:-mfpu=softvfp}}"
-+
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
- 
- #define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
- 
- #undef  MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
--	{ "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mapcs-32", "mno-thumb-interwork" }
-+	{ "marm", TARGET_ENDIAN_OPTION, "mapcs-32", "mno-thumb-interwork" }
- 
- #define CPP_APCS_PC_DEFAULT_SPEC "-D__APCS_32__"
- 
-@@ -72,7 +85,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- /* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
-    the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
---- gcc-3.4.4/gcc/config/arm/t-linux
-+++ gcc-3.4.4/gcc/config/arm/t-linux
-@@ -4,7 +4,10 @@
- LIBGCC2_DEBUG_CFLAGS = -g0
- 
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
-+	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+	_fixsfsi _fixunssfsi
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
---- gcc-3.4.4/gcc/config/arm/unknown-elf.h
-+++ gcc-3.4.4/gcc/config/arm/unknown-elf.h
-@@ -30,7 +30,12 @@
- 
- /* Default to using APCS-32 and software floating point.  */
- #ifndef TARGET_DEFAULT
--#define TARGET_DEFAULT	(ARM_FLAG_SOFT_FLOAT | ARM_FLAG_APCS_32 | ARM_FLAG_APCS_FRAME | ARM_FLAG_MMU_TRAPS)
-+#define TARGET_DEFAULT		\
-+	( ARM_FLAG_SOFT_FLOAT	\
-+	| ARM_FLAG_VFP		\
-+	| ARM_FLAG_APCS_32 	\
-+	| ARM_FLAG_APCS_FRAME 	\
-+	| ARM_FLAG_MMU_TRAPS )
- #endif
- 
- /* Now we define the strings used to build the spec file.  */
---- gcc-3.4.4/gcc/config/arm/xscale-elf.h
-+++ gcc-3.4.4/gcc/config/arm/xscale-elf.h
-@@ -51,9 +51,9 @@
- 		     
- #define SUBTARGET_EXTRA_ASM_SPEC "%{!mcpu=*:-mcpu=xscale} \
-   %{mhard-float:-mfpu=fpa} \
--  %{!mhard-float: %{msoft-float:-mfpu=softfpa;:-mfpu=softvfp}}"
-+  %{!mhard-float: %{msoft-float:-mfpu=softvfp} %{!msoft-float:-mfpu=softvfp}}"
- 
- #ifndef MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
--  { "mlittle-endian", "mno-thumb-interwork", "marm", "msoft-float" }
-+  { "mlittle-endian", "mno-thumb-interwork", "marm" }
- #endif

diff --git a/sys-devel/gcc/files/3.4.4/prefix-search-dirs.patch b/sys-devel/gcc/files/3.4.4/prefix-search-dirs.patch
deleted file mode 100644
index 08e558a237..0000000000
--- a/sys-devel/gcc/files/3.4.4/prefix-search-dirs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gcc/gcc.c.orig	2009-03-25 19:20:50 +0100
-+++ gcc/gcc.c	2009-03-26 00:37:23 +0100
-@@ -1525,8 +1525,8 @@ static const char *gcc_libexec_prefix;
- #endif
- 
- static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX;
--static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/";
--static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/";
-+static const char *const standard_exec_prefix_1 = "@GENTOO_PORTAGE_EPREFIX@/usr/libexec/gcc/";
-+static const char *const standard_exec_prefix_2 = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/";
- static const char *md_exec_prefix = MD_EXEC_PREFIX;
-
- static const char *md_startfile_prefix = MD_STARTFILE_PREFIX;

diff --git a/sys-devel/gcc/files/4.3.0/solarisx86_64.patch b/sys-devel/gcc/files/4.3.0/solarisx86_64.patch
deleted file mode 100644
index 7536aa45ec..0000000000
--- a/sys-devel/gcc/files/4.3.0/solarisx86_64.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- gcc/config.orig/i386/sol2-64.h
-+++ gcc/config/i386/sol2-64.h
-@@ -0,0 +1,5 @@
-+/* Definitions of target machine for GCC, for bi-arch i386
-+   running Solaris 2, defaulting to 64-bit code generation.  */
-+
-+#undef MULTILIB_DEFAULTS
-+#define MULTILIB_DEFAULTS { "m64" }
---- gcc/config.gcc
-+++ gcc/config.gcc
-@@ -1251,6 +1246,78 @@
- 		;;
- 	esac
- 	;;
-+x86_64-*-solaris2*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h"
-+	case ${target} in
-+	*-*-solaris2.1[0-9]*)
-+		tm_file="${tm_file} sol2-10.h"
-+		;;
-+	esac
-+	tm_file="${tm_file} i386/sol2.h"
-+	tmake_file="t-sol2 i386/t-sol2 t-svr4"
-+	c_target_objs="sol2-c.o"
-+	cxx_target_objs="sol2-c.o"
-+	extra_objs="sol2.o"
-+	tm_p_file="${tm_p_file} sol2-protos.h"
-+	if test x$gnu_ld = xyes; then
-+		tmake_file="$tmake_file t-slibgcc-elf-ver"
-+		tm_defines="${tm_defines} TARGET_GNU_LD=1"
-+	else
-+		tmake_file="$tmake_file t-slibgcc-sld"
-+	fi
-+	if test x$gas = xyes; then
-+		tm_file="usegas.h ${tm_file}"
-+	fi
-+	case ${target} in
-+	*-*-solaris2.[789] | *-*-solaris2.1[0-9]*)
-+		tm_file="$tm_file tm-dwarf2.h"
-+		;;
-+	esac
-+	case ${target} in
-+	*-*-solaris2.1[0-9]*)
-+		tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h i386/sol2-64.h"
-+		tm_defines="${tm_defines} TARGET_BI_ARCH=1"
-+		tmake_file="$tmake_file i386/t-crtstuff i386/t-sol2-10"
-+		need_64bit_hwint=yes
-+		# FIXME: -m64 for i[34567]86-*-* should be allowed just
-+		# like -m32 for x86_64-*-*.
-+		case X"${with_cpu}" in
-+		Xgeneric|Xnocona|Xx86-64|Xk8|Xopteron|Xathlon64|Xathlon-fx)
-+			;;
-+		X)
-+			with_cpu=generic
-+			;;
-+		*)
-+			echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-+			echo "generic nocona x86-64 k8 opteron athlon64 athlon-fx" 1>&2
-+			exit 1
-+			;;
-+		esac
-+		# Solaris 2.10 provides crt1.o, crti.o, crtn.o, and gcrt1.o as
-+		# part of the base system.
-+		extra_parts="gmon.o crtbegin.o crtend.o"
-+		;;
-+	*)
-+		extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
-+		;;
-+	esac
-+	case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
-+	  "":yes:* | yes:yes:* )
-+		case ${target} in
-+		  *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-+			thread_file=posix95
-+			;;
-+		  *)
-+			thread_file=posix
-+			;;
-+		esac
-+		;;
-+	  "":*:yes | yes:*:yes )
-+		thread_file=solaris
-+		;;
-+	esac
-+	extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h pmmintrin.h"
-+	;;
- i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
-        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h"
-        if test x$stabs = xyes
---- libgcc/config.host
-+++ libgcc/config.host
-@@ -352,6 +352,8 @@
- 	;;
- i[34567]86-*-sco3.2v5*)	# 80386 running SCO Open Server 5
- 	;;
-+x86_64-*-solaris2*)
-+	;;
- i[34567]86-*-solaris2*)
- 	;;
- i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5

diff --git a/sys-devel/gcc/files/4.3.0/targettools-checks.patch b/sys-devel/gcc/files/4.3.0/targettools-checks.patch
deleted file mode 100644
index 822c87886e..0000000000
--- a/sys-devel/gcc/files/4.3.0/targettools-checks.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-# Since http://gcc.gnu.org/bugzilla/show_bug.cgi?id=33637 lacks
-# a real fix, this is just an ugly workaround required for AIX.
-
---- gcc/configure.ac.orig	2007-10-08 16:18:43 +0200
-+++ gcc/configure.ac	2007-10-08 16:22:22 +0200
-@@ -1877,7 +1877,7 @@
- elif test -x as$build_exeext; then
- 	# Build using assembler in the current directory.
- 	gcc_cv_as=./as$build_exeext
--elif test -x $AS_FOR_TARGET; then
-+elif ( set dummy $AS_FOR_TARGET; test -x $[2] ); then
-         gcc_cv_as="$AS_FOR_TARGET"
- else
-         AC_PATH_PROG(gcc_cv_as, $AS_FOR_TARGET)
-@@ -1928,7 +1928,7 @@
- elif test -x collect-ld$build_exeext; then
- 	# Build using linker in the current directory.
- 	gcc_cv_ld=./collect-ld$build_exeext
--elif test -x $LD_FOR_TARGET; then
-+elif ( set dummy $LD_FOR_TARGET; test -x $[2] ); then
-         gcc_cv_ld="$LD_FOR_TARGET"
- else
-         AC_PATH_PROG(gcc_cv_ld, $LD_FOR_TARGET)
-@@ -1975,7 +1975,7 @@
- 	gcc_cv_nm=../binutils/nm-new$build_exeext
- elif test -x nm$build_exeext; then
- 	gcc_cv_nm=./nm$build_exeext
--elif test -x $NM_FOR_TARGET; then
-+elif ( set dummy $NM_FOR_TARGET; test -x $[2] ); then
-         gcc_cv_nm="$NM_FOR_TARGET"
- else
-         AC_PATH_PROG(gcc_cv_nm, $NM_FOR_TARGET)
-@@ -2003,7 +2003,7 @@
- 	gcc_cv_objdump=../binutils/objdump$build_exeext
- elif test -x objdump$build_exeext; then
- 	gcc_cv_objdump=./objdump$build_exeext
--elif test -x $OBJDUMP_FOR_TARGET; then
-+elif ( set dummy $OBJDUMP_FOR_TARGET; test -x $[2] ); then
-         gcc_cv_objdump="$OBJDUMP_FOR_TARGET"
- else
-         AC_PATH_PROG(gcc_cv_objdump, $OBJDUMP_FOR_TARGET)
---- gcc/configure.orig	2007-10-08 16:18:46 +0200
-+++ gcc/configure	2007-10-08 16:23:26 +0200
-@@ -13303,7 +13303,7 @@
- elif test -x as$build_exeext; then
- 	# Build using assembler in the current directory.
- 	gcc_cv_as=./as$build_exeext
--elif test -x $AS_FOR_TARGET; then
-+elif ( set dummy $AS_FOR_TARGET; test -x $2 ); then
-         gcc_cv_as="$AS_FOR_TARGET"
- else
-         # Extract the first word of "$AS_FOR_TARGET", so it can be a program name with args.
-@@ -13419,7 +13419,7 @@
- elif test -x collect-ld$build_exeext; then
- 	# Build using linker in the current directory.
- 	gcc_cv_ld=./collect-ld$build_exeext
--elif test -x $LD_FOR_TARGET; then
-+elif ( set dummy $LD_FOR_TARGET; test -x $2 ); then
-         gcc_cv_ld="$LD_FOR_TARGET"
- else
-         # Extract the first word of "$LD_FOR_TARGET", so it can be a program name with args.
-@@ -13510,7 +13510,7 @@
- 	gcc_cv_nm=../binutils/nm-new$build_exeext
- elif test -x nm$build_exeext; then
- 	gcc_cv_nm=./nm$build_exeext
--elif test -x $NM_FOR_TARGET; then
-+elif ( set dummy $NM_FOR_TARGET; test -x $2 ); then
-         gcc_cv_nm="$NM_FOR_TARGET"
- else
-         # Extract the first word of "$NM_FOR_TARGET", so it can be a program name with args.
-@@ -13584,7 +13584,7 @@
- 	gcc_cv_objdump=../binutils/objdump$build_exeext
- elif test -x objdump$build_exeext; then
- 	gcc_cv_objdump=./objdump$build_exeext
--elif test -x $OBJDUMP_FOR_TARGET; then
-+elif ( set dummy $OBJDUMP_FOR_TARGET; test -x $2 ); then
-         gcc_cv_objdump="$OBJDUMP_FOR_TARGET"
- else
-         # Extract the first word of "$OBJDUMP_FOR_TARGET", so it can be a program name with args.
---- gcc/exec-tool.in.orig	2009-09-28 17:15:51 +0200
-+++ gcc/exec-tool.in	2009-09-28 17:16:06 +0200
-@@ -73,7 +73,7 @@
-     fi
-     ;;
-   *)
--    exec "$original" ${1+"$@"}
-+    exec $original ${1+"$@"}
-     ;;
- esac
- 

diff --git a/sys-devel/gcc/files/4.3.0/treelang-nomakeinfo.patch b/sys-devel/gcc/files/4.3.0/treelang-nomakeinfo.patch
deleted file mode 100644
index 318436a27e..0000000000
--- a/sys-devel/gcc/files/4.3.0/treelang-nomakeinfo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: gcc-4.3/gcc/Makefile.in
-===================================================================
---- gcc-4.3/gcc/Makefile.in	(revision 131913)
-+++ gcc-4.3/gcc/Makefile.in	(working copy)
-@@ -3617,7 +3622,11 @@ doc: $(BUILD_INFO) $(GENERATED_MANPAGES)
- INFOFILES = doc/cpp.info doc/gcc.info doc/gccint.info \
-             doc/gccinstall.info doc/cppinternals.info
- 
-+ifneq ($(BUILD_INFO),)
- info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo
-+else
-+info:
-+endif
- 
- srcinfo: $(INFOFILES)
- 	-cp -p $^ $(srcdir)/doc
-@@ -3983,6 +3992,7 @@ install-driver: installdirs xgcc$(exeext
- 	    mv -f $(target_noncanonical)-gcc-tmp$(exeext) $(GCC_TARGET_INSTALL_NAME)$(exeext) ); \
- 	fi
- 
-+ifneq ($(BUILD_INFO),)
- # Install the info files.
- # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
- # to do the install.
-@@ -3993,6 +4003,9 @@ install-info:: doc installdirs \
- 	$(DESTDIR)$(infodir)/gccinstall.info \
- 	$(DESTDIR)$(infodir)/gccint.info \
- 	lang.install-info
-+else
-+install-info:: doc installdirs
-+endif
- 
- $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs
- 	rm -f $@

diff --git a/sys-devel/gcc/files/4.4.0/gcc-4.4.0-softfloat.patch b/sys-devel/gcc/files/4.4.0/gcc-4.4.0-softfloat.patch
deleted file mode 100644
index bf8d7180cf..0000000000
--- a/sys-devel/gcc/files/4.4.0/gcc-4.4.0-softfloat.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-The hunk for gcc/config/arm/t-linux comes from:
-http://gcc.gnu.org/PR14352
-
-The rest is a custom job by Yuri Vasilevski.
-
-The idea here is that we add soft float support into the spec file
-so that we don't have to worry about packages stripping out softfloat
-flags from CFLAGS/CXXFLAGS.
-
-http://bugs.gentoo.org/75585
-
---- gcc-4.0.2/gcc/config/arm/elf.h
-+++ gcc-4.0.2/gcc/config/arm/elf.h
-@@ -45,8 +45,9 @@
- #endif
- 
- #ifndef SUBTARGET_ASM_FLOAT_SPEC
--#define SUBTARGET_ASM_FLOAT_SPEC "\
--%{mapcs-float:-mfloat}"
-+#define SUBTARGET_ASM_FLOAT_SPEC "%{mapcs-float:-mfloat} \
-+  %{mhard-float:-mfpu=fpa} \
-+  %{!mhard-float: %{msoft-float:-mfpu=softfpa;:-mfpu=softvfp}}"
- #endif
- 
- #ifndef ASM_SPEC
-@@ -58,8 +59,6 @@
- %{mapcs-*:-mapcs-%*} \
- %(subtarget_asm_float_spec) \
- %{mthumb-interwork:-mthumb-interwork} \
--%{msoft-float:-mfloat-abi=soft} %{mhard-float:-mfloat-abi=hard} \
--%{mfloat-abi=*} %{mfpu=*} \
- %(subtarget_extra_asm_spec)"
- #endif
- 
---- gcc-4.0.2/gcc/config/arm/linux-elf.h
-+++ gcc-4.0.2/gcc/config/arm/linux-elf.h
-@@ -28,7 +28,7 @@
- #define TARGET_VERSION  fputs (" (ARM GNU/Linux with ELF)", stderr);
- 
- #undef  TARGET_DEFAULT_FLOAT_ABI
--#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
-+#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
-@@ -44,6 +44,10 @@
- 
- #undef  TARGET_DEFAULT
- #define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
-+#undef  SUBTARGET_EXTRA_ASM_SPEC
-+#define SUBTARGET_EXTRA_ASM_SPEC "%{mhard-float:-mfpu=fpa} \
-+  %{!mhard-float: %{msoft-float:-mfpu=softfpa;:-mfpu=softvfp}}"
-+
- 
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
- 
-@@ -51,7 +55,7 @@
- 
- #undef  MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
--	{ "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
-+	{ "marm", TARGET_ENDIAN_OPTION, "msoft-float", "mno-thumb-interwork" }
- 
- /* Now we define the strings used to build the spec file.  */
- #undef  LIB_SPEC
-@@ -60,7 +64,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
---- gcc-4.0.2/gcc/config/arm/t-linux
-+++ gcc-4.0.2/gcc/config/arm/t-linux
-@@ -3,8 +3,10 @@
- TARGET_LIBGCC2_CFLAGS = -fomit-frame-pointer -fPIC
- 
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_arm_addsubdf3 _arm_addsubsf3
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
-+	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+	_fixsfsi _fixunssfsi _floatdidf _floatdisf
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float

diff --git a/sys-devel/gcc/files/4.4.0/gcc-4.4.1-solaris-x86_64.patch b/sys-devel/gcc/files/4.4.0/gcc-4.4.1-solaris-x86_64.patch
deleted file mode 100644
index 5cec9a443c..0000000000
--- a/sys-devel/gcc/files/4.4.0/gcc-4.4.1-solaris-x86_64.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- gcc-4.4.1/gcc/config.gcc
-+++ gcc-4.4.1/gcc/config.gcc
-@@ -2235,6 +2235,70 @@
- 	  "":*:yes | yes:*:yes ) thread_file=solaris ;;
- 	esac
- 	;;
-+x86_64-*-solaris2*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h"
-+	case ${target} in
-+	*-*-solaris2.1[0-9]*)
-+		tm_file="${tm_file} sol2-10.h"
-+		;;
-+	esac
-+	tm_file="${tm_file} i386/sol2.h"
-+	tmake_file="${tmake_file} t-sol2 t-svr4"
-+	c_target_objs="${c_target_objs} sol2-c.o"
-+	cxx_target_objs="${cxx_target_objs} sol2-c.o"
-+	extra_objs="sol2.o"
-+	tm_p_file="${tm_p_file} sol2-protos.h"
-+	if test x$gnu_ld = xyes; then
-+		tmake_file="$tmake_file t-slibgcc-elf-ver"
-+		tm_defines="${tm_defines} TARGET_GNU_LD=1"
-+	else
-+		tmake_file="$tmake_file t-slibgcc-sld"
-+	fi
-+	if test x$gas = xyes; then
-+		tm_file="usegas.h ${tm_file}"
-+	fi
-+	tm_file="$tm_file tm-dwarf2.h"
-+	case ${target} in
-+	*-*-solaris2.1[0-9]*)
-+		tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h i386/sol2-64.h"
-+		tm_defines="${tm_defines} TARGET_BI_ARCH=1"
-+		tmake_file="$tmake_file i386/t-sol2-10"
-+		# i386/t-crtstuff only affects libgcc.  Its inclusion
-+		# depends on a runtime test and is thus performed in
-+		# libgcc/configure.ac instead.
-+		need_64bit_hwint=yes
-+		case X"${with_cpu}" in
-+		Xgeneric|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
-+			;;
-+		X)
-+			if test x$with_cpu_64 = x; then
-+				with_cpu_64=generic
-+			fi
-+			;;
-+		*)
-+			echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-+			echo "generic core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
-+			exit 1
-+			;;
-+		esac
-+		;;
-+	esac
-+	case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
-+	  "":yes:* | yes:yes:* )
-+		case ${target} in
-+		  *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-+			thread_file=posix95
-+			;;
-+		  *)
-+			thread_file=posix
-+			;;
-+		esac
-+		;;
-+	  "":*:yes | yes:*:yes )
-+		thread_file=solaris
-+		;;
-+	esac
-+	;;
- sparc-*-solaris2*)
- 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sol2.h"
- 	case ${target} in
---- gcc-4.4.1/libgcc/configure.ac
-+++ gcc-4.4.1/libgcc/configure.ac
-@@ -176,7 +176,7 @@
- # Link with -nostartfiles -nodefaultlibs since neither are present while
- # building libgcc.
- case ${host} in
--i?86-*-solaris2.1[[0-9]]*)
-+i?86-*-solaris2.1[[0-9]]*|x86_64-*-solaris2.1[[0-9]]*)
-   cat > conftest.s <<EOF
- 	.section	.eh_frame,"a",@unwind
- 	.zero	4
---- gcc-4.4.1/libgcc/configure
-+++ gcc-4.4.1/libgcc/configure
-@@ -3425,7 +3425,7 @@
- # Link with -nostartfiles -nodefaultlibs since neither are present while
- # building libgcc.
- case ${host} in
--i?86-*-solaris2.1[0-9]*)
-+i?86-*-solaris2.1[0-9]*|x86_64-*-solaris2.1[0-9]*)
-   cat > conftest.s <<EOF
- 	.section	.eh_frame,"a",@unwind
- 	.zero	4
---- gcc-4.4.1/libgcc/config.host
-+++ gcc-4.4.1/libgcc/config.host
-@@ -316,7 +316,7 @@
- 	;;
- i[34567]86-*-rtems*)
- 	;;
--i[34567]86-*-solaris2*)
-+i[34567]86-*-solaris2*|x86_64-*-solaris2*)
- 	tmake_file="${tmake_file} i386/t-sol2"
- 	case ${host} in
- 	*-*-solaris2.1[0-9]*)
---- gcc-4.4.1/gcc/config/i386/sol2-64.h
-+++ gcc-4.4.1/gcc/config/i386/sol2-64.h
-@@ -0,0 +1,16 @@
-+/* Definitions of target machine for GCC, for bi-arch i386
-+   running Solaris 2, defaulting to 64-bit code generation.  */
-+
-+#undef MULTILIB_DEFAULTS
-+#define MULTILIB_DEFAULTS { "m64" }
-+
-+#undef TARGET_LD_EMULATION
-+#ifdef TARGET_GNU_LD
-+#define TARGET_LD_EMULATION "%{m64:-m elf_x86_64}%{m32:-m elf_i386} "
-+#else
-+#define TARGET_LD_EMULATION ""
-+#endif
-+
-+#undef LINK_ARCH_SPEC
-+#define LINK_ARCH_SPEC TARGET_LD_EMULATION \
-+		       "%{m64:" LINK_ARCH64_SPEC "}%{m32:" LINK_ARCH32_SPEC "}"

diff --git a/sys-devel/gcc/files/4.4.4/aix-bnoerok.patch b/sys-devel/gcc/files/4.4.4/aix-bnoerok.patch
deleted file mode 100644
index c0244e9690..0000000000
--- a/sys-devel/gcc/files/4.4.4/aix-bnoerok.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://gcc.gnu.org/PR46887
-Fix a typo in gcc-local copy of libtool files.
-This is triggered in Prefix only, as elibtoolize enables aix_runtime_linking.
-
---- libjava/classpath/ltcf-cxx.sh.orig	2010-04-24 15:32:46.967555111 +0200
-+++ libjava/classpath/ltcf-cxx.sh	2010-04-24 15:33:12.627573175 +0200
-@@ -204,7 +204,7 @@
-         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
-         # Warning - without using the other run time loading flags, -berok will
-         #           link without error, but may produce a broken library.
--        no_undefined_flag=' ${wl}-bnoerok'
-+        no_undefined_flag=' ${wl}-bernotok'
-         allow_undefined_flag=' ${wl}-berok'
-         # -bexpall does not export symbols beginning with underscore (_)
-         always_export_symbols=yes

diff --git a/sys-devel/gcc/files/4.5.1/aix-force-pthread.patch b/sys-devel/gcc/files/4.5.1/aix-force-pthread.patch
deleted file mode 100644
index 8d19282c87..0000000000
--- a/sys-devel/gcc/files/4.5.1/aix-force-pthread.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-diff -ru gcc/config/rs6000.orig/aix43.h gcc/config/rs6000/aix43.h
---- gcc/config/rs6000.orig/aix43.h	2009-07-31 14:24:20 +0200
-+++ gcc/config/rs6000/aix43.h	2009-07-31 14:25:50 +0200
-@@ -105,7 +105,7 @@
-    %{ansi: -D_ANSI_C_SOURCE}\
-    %{maix64: -D__64BIT__}\
-    %{mpe: -I%R/usr/lpp/ppe.poe/include}\
--   %{pthread: -D_THREAD_SAFE}"
-+   %{pthread:} -D_THREAD_SAFE"
- 
- /* The GNU C++ standard library requires that these macros be 
-    defined.  */
-@@ -114,7 +114,7 @@
-   "-D_ALL_SOURCE				\
-    %{maix64: -D__64BIT__}			\
-    %{mpe: -I%R/usr/lpp/ppe.poe/include}		\
--   %{pthread: -D_THREAD_SAFE}"
-+   %{pthread:} -D_THREAD_SAFE"
- 
- #undef TARGET_DEFAULT
- #define TARGET_DEFAULT MASK_NEW_MNEMONICS
-@@ -145,8 +145,8 @@
-    %{p:-L%R/lib/profiled -L%R/usr/lib/profiled}\
-    %{!maix64:%{!shared:%{g*:-lg}}}\
-    %{mpe:-L%R/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
--   %{pthread:-L%R/usr/lib/threads -lpthreads -lc_r %R/usr/lib/libc.a}\
--   %{!pthread:-lc}"
-+   %{pthread:}-L%R/usr/lib/threads -lpthreads -lc_r %R/usr/lib/libc.a\
-+   "
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-@@ -158,8 +158,8 @@
- #define STARTFILE_SPEC "%{!shared:\
-    %{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
-    %{!maix64:\
--     %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
--     %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
-+     %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
-+     }}"
- 
- /* AIX 4.3 typedefs ptrdiff_t as "long" while earlier releases used "int".  */
- 
-diff -ru gcc/config/rs6000.orig/aix51.h gcc/config/rs6000/aix51.h
---- gcc/config/rs6000.orig/aix51.h	2009-07-31 14:24:20 +0200
-+++ gcc/config/rs6000/aix51.h	2009-07-31 14:26:13 +0200
-@@ -101,7 +101,7 @@
-   %{ansi: -D_ANSI_C_SOURCE}			\
-   %{maix64: -D__64BIT__}			\
-   %{mpe: -I%R/usr/lpp/ppe.poe/include}		\
--  %{pthread: -D_THREAD_SAFE}"
-+  %{pthread:} -D_THREAD_SAFE"
- 
- /* The GNU C++ standard library requires that these macros be 
-    defined.  */
-@@ -110,7 +110,7 @@
-   "-D_ALL_SOURCE				\
-    %{maix64: -D__64BIT__}			\
-    %{mpe: -I%R/usr/lpp/ppe.poe/include}		\
--   %{pthread: -D_THREAD_SAFE}"
-+   %{pthread:} -D_THREAD_SAFE"
- 
- #undef TARGET_DEFAULT
- #define TARGET_DEFAULT MASK_NEW_MNEMONICS
-@@ -141,7 +141,7 @@
-    %{p:-L%R/lib/profiled -L%R/usr/lib/profiled}\
-    %{!maix64:%{!shared:%{g*:-lg}}}\
-    %{mpe:-L%R/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
--   %{pthread:-lpthreads} -lc"
-+   %{pthread:}-lpthreads -lc"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-@@ -153,8 +153,8 @@
- #define STARTFILE_SPEC "%{!shared:\
-    %{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
-    %{!maix64:\
--     %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
--     %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
-+     %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
-+     }}"
- 
- /* AIX V5 typedefs ptrdiff_t as "long" while earlier releases used "int".  */
- 
-diff -ru gcc/config/rs6000.orig/aix52.h gcc/config/rs6000/aix52.h
---- gcc/config/rs6000.orig/aix52.h	2009-07-31 14:24:20 +0200
-+++ gcc/config/rs6000/aix52.h	2009-07-31 14:26:31 +0200
-@@ -100,7 +100,7 @@
-   %{ansi: -D_ANSI_C_SOURCE}			\
-   %{maix64: -D__64BIT__}			\
-   %{mpe: -I%R/usr/lpp/ppe.poe/include}		\
--  %{pthread: -D_THREAD_SAFE}"
-+  %{pthread:} -D_THREAD_SAFE"
- 
- /* The GNU C++ standard library requires that these macros be 
-    defined.  Synchronize with libstdc++ os_defines.h.  */
-@@ -109,7 +109,7 @@
-   "-D_ALL_SOURCE				\
-    %{maix64: -D__64BIT__}			\
-    %{mpe: -I%R/usr/lpp/ppe.poe/include}		\
--   %{pthread: -D_THREAD_SAFE}"
-+   %{pthread:} -D_THREAD_SAFE"
- 
- #undef  TARGET_DEFAULT
- #define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS)
-@@ -144,7 +144,7 @@
-    %{p:-L%R/lib/profiled -L%R/usr/lib/profiled}\
-    %{!maix64:%{!shared:%{g*:-lg}}}\
-    %{mpe:-L%R/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
--   %{pthread:-lpthreads} -lc"
-+   %{pthread:}-lpthreads -lc"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-@@ -156,8 +156,8 @@
- #define STARTFILE_SPEC "%{!shared:\
-    %{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
-    %{!maix64:\
--     %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
--     %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
-+     %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
-+     }}"
- 
- /* AIX V5 typedefs ptrdiff_t as "long" while earlier releases used "int".  */
- 
-diff -ru gcc/config/rs6000.orig/aix53.h gcc/config/rs6000/aix53.h
---- gcc/config/rs6000.orig/aix53.h	2009-07-31 14:24:20 +0200
-+++ gcc/config/rs6000/aix53.h	2009-07-31 14:26:47 +0200
-@@ -102,7 +102,7 @@
-   %{ansi: -D_ANSI_C_SOURCE}			\
-   %{maix64: -D__64BIT__}			\
-   %{mpe: -I%R/usr/lpp/ppe.poe/include}		\
--  %{pthread: -D_THREAD_SAFE}"
-+  %{pthread:} -D_THREAD_SAFE"
- 
- /* The GNU C++ standard library requires that these macros be 
-    defined.  Synchronize with libstdc++ os_defines.h.  */
-@@ -111,7 +111,7 @@
-   "-D_ALL_SOURCE				\
-    %{maix64: -D__64BIT__}			\
-    %{mpe: -I%R/usr/lpp/ppe.poe/include}		\
--   %{pthread: -D_THREAD_SAFE}"
-+   %{pthread:} -D_THREAD_SAFE"
- 
- #undef  TARGET_DEFAULT
- #define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS)
-@@ -140,7 +140,7 @@
-    %{p:-L%R/lib/profiled -L%R/usr/lib/profiled}\
-    %{!maix64:%{!shared:%{g*:-lg}}}\
-    %{mpe:-L%R/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
--   %{pthread:-lpthreads} -lc"
-+   %{pthread:}-lpthreads -lc"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-@@ -152,8 +152,8 @@
- #define STARTFILE_SPEC "%{!shared:\
-    %{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
-    %{!maix64:\
--     %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
--     %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
-+     %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
-+     }}"
- 
- /* AIX V5 typedefs ptrdiff_t as "long" while earlier releases used "int".  */
- 
-diff -ru gcc/config/rs6000.orig/aix61.h gcc/config/rs6000/aix61.h
---- gcc/config/rs6000.orig/aix61.h	2009-07-31 14:24:20 +0200
-+++ gcc/config/rs6000/aix61.h	2009-07-31 14:27:02 +0200
-@@ -103,7 +103,7 @@
-   %{ansi: -D_ANSI_C_SOURCE}			\
-   %{maix64: -D__64BIT__}			\
-   %{mpe: -I%R/usr/lpp/ppe.poe/include}		\
--  %{pthread: -D_THREAD_SAFE}"
-+  %{pthread:} -D_THREAD_SAFE"
- 
- /* The GNU C++ standard library requires that these macros be 
-    defined.  Synchronize with libstdc++ os_defines.h.  */
-@@ -112,7 +112,7 @@
-   "-D_ALL_SOURCE -D__COMPATMATH__		\
-    %{maix64: -D__64BIT__}			\
-    %{mpe: -I%R/usr/lpp/ppe.poe/include}		\
--   %{pthread: -D_THREAD_SAFE}"
-+   %{pthread:} -D_THREAD_SAFE"
- 
- #undef  TARGET_DEFAULT
- #define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS)
-@@ -141,7 +141,7 @@
-    %{p:-L%R/lib/profiled -L%R/usr/lib/profiled}\
-    %{!maix64:%{!shared:%{g*:-lg}}}\
-    %{mpe:-L%R/usr/lpp/ppe.poe/lib -lmpi -lvtd}\
--   %{pthread:-lpthreads} -lc"
-+   %{pthread:}-lpthreads -lc"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "-bpT:0x10000000 -bpD:0x20000000 %{!r:-btextro} -bnodelcsect\
-@@ -153,8 +153,8 @@
- #define STARTFILE_SPEC "%{!shared:\
-    %{maix64:%{pg:gcrt0_64%O%s}%{!pg:%{p:mcrt0_64%O%s}%{!p:crt0_64%O%s}}}\
-    %{!maix64:\
--     %{pthread:%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}}\
--     %{!pthread:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}}}}"
-+     %{pthread:}%{pg:gcrt0_r%O%s}%{!pg:%{p:mcrt0_r%O%s}%{!p:crt0_r%O%s}}\
-+     }}"
- 
- /* AIX V5 typedefs ptrdiff_t as "long" while earlier releases used "int".  */
- 
-diff -ru gcc/config/rs6000.orig/t-aix43 gcc/config/rs6000/t-aix43
---- gcc/config/rs6000.orig/t-aix43	2009-07-31 14:24:20 +0200
-+++ gcc/config/rs6000/t-aix43	2009-07-31 14:29:20 +0200
-@@ -10,13 +10,13 @@
- 	echo '#define FLOAT' > fp-bit.c
- 	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
- 
--# Build the libraries for pthread and all of the 
-+# Build the libraries for all of the 
- # different processor models
- 
--MULTILIB_OPTIONS	= pthread \
-+MULTILIB_OPTIONS	= \
- 			  mcpu=common/mcpu=power/mcpu=powerpc/maix64
- 
--MULTILIB_DIRNAMES	= pthread \
-+MULTILIB_DIRNAMES	= \
- 			  common power powerpc ppc64
- 
- MULTILIB_MATCHES	= mcpu?power=mcpu?power \
-@@ -46,7 +46,7 @@
- SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
- 	-Wl,-bE:@shlib_map_file@ -o @multilib_dir@/shr.o \
- 	@multilib_flags@ @shlib_objs@ -lc \
--	`case @multilib_dir@ in \
-+	`case pthread@multilib_dir@ in \
- 	*pthread*) echo -L/usr/lib/threads -lpthreads -lc_r /usr/lib/libc.a ;; \
- 	*) echo -lc ;; esac` ; \
- 	rm -f @multilib_dir@/tmp-@shlib_base_name@.a ; \
-@@ -61,7 +61,7 @@
- 	$$(mkinstalldirs) $$(DESTDIR)$$(slibdir)@shlib_slibdir_qual@; \
- 	$(INSTALL_DATA) @multilib_dir@/@shlib_base_name@.a \
- 		$$(DESTDIR)$$(slibdir)@shlib_slibdir_qual@/
--SHLIB_LIBS = -lc `case @multilib_dir@ in *pthread*) echo -lpthread ;; esac`
-+SHLIB_LIBS = -lc `case pthread@multilib_dir@ in *pthread*) echo -lpthread ;; esac`
- SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
- SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/rs6000/libgcc-ppc64.ver
- SHLIB_NM_FLAGS = -Bpg -X32_64
-diff -ru gcc/config/rs6000.orig/t-aix52 gcc/config/rs6000/t-aix52
---- gcc/config/rs6000.orig/t-aix52	2009-07-31 14:24:20 +0200
-+++ gcc/config/rs6000/t-aix52	2009-07-31 14:29:38 +0200
-@@ -10,12 +10,12 @@
- 	echo '#define FLOAT' > fp-bit.c
- 	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
- 
--# Build the libraries for pthread and all of the 
-+# Build the libraries for all of the 
- # different processor models
- 
--MULTILIB_OPTIONS	= pthread maix64
-+MULTILIB_OPTIONS	= maix64
- 
--MULTILIB_DIRNAMES	= pthread ppc64
-+MULTILIB_DIRNAMES	= ppc64
- 
- MULTILIB_MATCHES	= 
- 
-@@ -27,7 +27,7 @@
- SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
- 	-Wl,-bE:@shlib_map_file@ -o @multilib_dir@/shr.o \
- 	@multilib_flags@ @shlib_objs@ -lc \
--	`case @multilib_dir@ in \
-+	`case pthread@multilib_dir@ in \
- 	*pthread*) echo -L$(TARGET_SYSTEM_ROOT)/usr/lib/threads -lpthreads -lc_r $(TARGET_SYSTEM_ROOT)/usr/lib/libc.a ;; \
- 	*) echo -lc ;; esac` ; \
- 	rm -f @multilib_dir@/tmp-@shlib_base_name@.a ; \
-@@ -42,7 +42,7 @@
- 	$$(mkinstalldirs) $$(DESTDIR)$$(slibdir)@shlib_slibdir_qual@; \
- 	$(INSTALL_DATA) @multilib_dir@/@shlib_base_name@.a \
- 		$$(DESTDIR)$$(slibdir)@shlib_slibdir_qual@/
--SHLIB_LIBS = -lc `case @multilib_dir@ in *pthread*) echo -lpthread ;; esac`
-+SHLIB_LIBS = -lc `case pthread@multilib_dir@ in *pthread*) echo -lpthread ;; esac`
- SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
- SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver $(srcdir)/config/rs6000/libgcc-ppc64.ver
- SHLIB_NM_FLAGS = -Bpg -X32_64

diff --git a/sys-devel/gcc/files/4.5.1/gcc-4.5.1-mint1.patch b/sys-devel/gcc/files/4.5.1/gcc-4.5.1-mint1.patch
deleted file mode 100644
index 52d0a7893e..0000000000
--- a/sys-devel/gcc/files/4.5.1/gcc-4.5.1-mint1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=347319
-
---- libiberty/configure.old	2010-11-26 18:13:54.000000000 +0000
-+++ libiberty/configure	2010-11-26 18:15:21.000000000 +0000
-@@ -4844,6 +4844,7 @@
- if [ "${shared}" = "yes" ]; then
-   case "${host}" in
-     *-*-cygwin*)	;;
-+    *-*-mint*)	;;
-     alpha*-*-linux*)	PICFLAG=-fPIC ;;
-     arm*-*-*)		PICFLAG=-fPIC ;;
-     hppa*-*-*)		PICFLAG=-fPIC ;;
---- libiberty/configure.ac.old	2010-11-26 18:15:27.000000000 +0000
-+++ libiberty/configure.ac	2010-11-26 18:15:38.000000000 +0000
-@@ -201,6 +201,7 @@
- if [[ "${shared}" = "yes" ]]; then
-   case "${host}" in
-     *-*-cygwin*)	;;
-+    *-*-mint*)	;;
-     alpha*-*-linux*)	PICFLAG=-fPIC ;;
-     arm*-*-*)		PICFLAG=-fPIC ;;
-     hppa*-*-*)		PICFLAG=-fPIC ;;
---- gcc/Makefile.in.old	2010-11-26 18:16:31.000000000 +0000
-+++ gcc/Makefile.in	2010-11-26 18:17:13.000000000 +0000
-@@ -1819,6 +1819,7 @@
- cc1$(exeext): $(C_OBJS) cc1-checksum.o $(BACKEND) $(LIBDEPS)
- 	$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \
- 	  cc1-checksum.o $(BACKEND) $(LIBS) $(BACKENDLIBS)
-+	stack -S 3 $@
- 
- #
- # Build libgcc.a.

diff --git a/sys-devel/gcc/files/4.5.1/ia64-hpux-always-pthread.patch b/sys-devel/gcc/files/4.5.1/ia64-hpux-always-pthread.patch
deleted file mode 100644
index f20123b70e..0000000000
--- a/sys-devel/gcc/files/4.5.1/ia64-hpux-always-pthread.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://archives.gentoo.org/gentoo-portage-dev/msg_a98f2d22e6ec550bd55246a95768628d.xml
-
---- gcc/config/ia64/hpux.h.orig	2009-07-30 16:43:06 +0200
-+++ gcc/config/ia64/hpux.h	2009-07-30 16:43:36 +0200
-@@ -60,7 +60,7 @@
- 
- #undef CPP_SPEC
- #define CPP_SPEC \
--  "%{mt|pthread:-D_REENTRANT -D_THREAD_SAFE -D_POSIX_C_SOURCE=199506L}"
-+  "%{mt|pthread:}-D_REENTRANT -D_THREAD_SAFE -D_POSIX_C_SOURCE=199506L"
- /* aCC defines also -DRWSTD_MULTI_THREAD, -DRW_MULTI_THREAD.  These
-    affect only aCC's C++ library (Rogue Wave-derived) which we do not
-    use, and they violate the user's name space.  */
-@@ -86,7 +86,7 @@
- #undef  LIB_SPEC
- #define LIB_SPEC \
-   "%{!shared: \
--     %{mt|pthread:%{fopenmp:-lrt} -lpthread} \
-+     %{mt|pthread:}%{fopenmp:-lrt} -lpthread \
-      %{p:%{!mlp64:-L/usr/lib/hpux32/libp} \
- 	 %{mlp64:-L/usr/lib/hpux64/libp} -lprof} \
-      %{pg:%{!mlp64:-L/usr/lib/hpux32/libp} \

diff --git a/sys-devel/gcc/files/4.5.1/solaris-x86_64.patch b/sys-devel/gcc/files/4.5.1/solaris-x86_64.patch
deleted file mode 100644
index 70df04c478..0000000000
--- a/sys-devel/gcc/files/4.5.1/solaris-x86_64.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- gcc-4.4.1/gcc/config.gcc
-+++ gcc-4.4.1/gcc/config.gcc
-@@ -2235,6 +2235,70 @@
- 		;;
- 	esac
- 	;;
-+x86_64-*-solaris2*)
-+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/sysv4.h sol2.h"
-+	case ${target} in
-+	*-*-solaris2.1[0-9]*)
-+		tm_file="${tm_file} sol2-10.h"
-+		;;
-+	esac
-+	tm_file="${tm_file} i386/sol2.h"
-+	tmake_file="${tmake_file} t-sol2 t-svr4"
-+	c_target_objs="${c_target_objs} sol2-c.o"
-+	cxx_target_objs="${cxx_target_objs} sol2-c.o"
-+	extra_objs="sol2.o"
-+	tm_p_file="${tm_p_file} sol2-protos.h"
-+	if test x$gnu_ld = xyes; then
-+		tmake_file="$tmake_file t-slibgcc-elf-ver"
-+		tm_defines="${tm_defines} TARGET_GNU_LD=1"
-+	else
-+		tmake_file="$tmake_file t-slibgcc-sld"
-+	fi
-+	if test x$gas = xyes; then
-+		tm_file="usegas.h ${tm_file}"
-+	fi
-+	tm_file="$tm_file tm-dwarf2.h"
-+	case ${target} in
-+	*-*-solaris2.1[0-9]*)
-+		tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h i386/sol2-64.h"
-+		tm_defines="${tm_defines} TARGET_BI_ARCH=1"
-+		tmake_file="$tmake_file i386/t-sol2-10"
-+		# i386/t-crtstuff only affects libgcc.  Its inclusion
-+		# depends on a runtime test and is thus performed in
-+		# libgcc/configure.ac instead.
-+		need_64bit_hwint=yes
-+		case X"${with_cpu}" in
-+		Xgeneric|Xcore2|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx)
-+			;;
-+		X)
-+			if test x$with_cpu_64 = x; then
-+				with_cpu_64=generic
-+			fi
-+			;;
-+		*)
-+			echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
-+			echo "generic core2 nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2
-+			exit 1
-+			;;
-+		esac
-+		;;
-+	esac
-+	case ${enable_threads}:${have_pthread_h}:${have_thread_h} in
-+	  "":yes:* | yes:yes:* )
-+		case ${target} in
-+		  *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*)
-+			thread_file=posix95
-+			;;
-+		  *)
-+			thread_file=posix
-+			;;
-+		esac
-+		;;
-+	  "":*:yes | yes:*:yes )
-+		thread_file=solaris
-+		;;
-+	esac
-+	;;
- i[4567]86-wrs-vxworks|i[4567]86-wrs-vxworksae)
- 	tm_file="${tm_file} i386/unix.h i386/att.h elfos.h svr4.h vx-common.h"
- 	case ${target} in
---- gcc-4.4.1/libgcc/configure.ac
-+++ gcc-4.4.1/libgcc/configure.ac
-@@ -176,7 +176,7 @@
- # Link with -nostartfiles -nodefaultlibs since neither are present while
- # building libgcc.
- case ${host} in
--i?86-*-solaris2.1[[0-9]]*)
-+i?86-*-solaris2.1[[0-9]]*|x86_64-*-solaris2.1[[0-9]]*)
-   cat > conftest.s <<EOF
- 	.section	.eh_frame,"a",@unwind
- 	.zero	4
---- gcc-4.4.1/libgcc/configure
-+++ gcc-4.4.1/libgcc/configure
-@@ -3425,7 +3425,7 @@
- # Link with -nostartfiles -nodefaultlibs since neither are present while
- # building libgcc.
- case ${host} in
--i?86-*-solaris2.1[0-9]*)
-+i?86-*-solaris2.1[0-9]*|x86_64-*-solaris2.1[0-9]*)
-   cat > conftest.s <<EOF
- 	.section	.eh_frame,"a",@unwind
- 	.zero	4
---- gcc-4.4.1/libgcc/config.host
-+++ gcc-4.4.1/libgcc/config.host
-@@ -316,7 +316,7 @@
- 	;;
- i[34567]86-*-rtems*)
- 	;;
--i[34567]86-*-solaris2*)
-+i[34567]86-*-solaris2*|x86_64-*-solaris2*)
- 	tmake_file="${tmake_file} i386/t-sol2"
- 	case ${host} in
- 	*-*-solaris2.1[0-9]*)
---- gcc-4.4.1/gcc/config/i386/sol2-64.h
-+++ gcc-4.4.1/gcc/config/i386/sol2-64.h
-@@ -0,0 +1,5 @@
-+/* Definitions of target machine for GCC, for bi-arch i386
-+   running Solaris 2, defaulting to 64-bit code generation.  */
-+
-+#undef MULTILIB_DEFAULTS
-+#define MULTILIB_DEFAULTS { "m64" }

diff --git a/sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint1.patch b/sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint1.patch
deleted file mode 100644
index 85ac4a4149..0000000000
--- a/sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint1.patch
+++ /dev/null
@@ -1,335 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=350822
-
---- libstdc++-v3/libsupc++/guard.cc.old	2008-04-21 14:01:06.429023196 +0100
-+++ libstdc++-v3/libsupc++/guard.cc	2008-04-21 14:01:25.230287338 +0100
-@@ -30,6 +30,7 @@
- // Thread support written by Jason Merrill, Red Hat Inc. <jason@××××××.com>
- 
- #include <bits/c++config.h>
-+#include <cstdlib>
- #include <cxxabi.h>
- #include <exception>
- #include <new>
---- libstdc++-v3/src/codecvt.cc.old	2008-04-21 14:32:37.116117842 +0100
-+++ libstdc++-v3/src/codecvt.cc	2008-04-21 14:32:47.505045768 +0100
-@@ -27,6 +27,7 @@
- 
- // Written by Benjamin Kosnik <bkoz@××××××.com>
- 
-+#include <cstdlib>
- #include <locale>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/src/complex_io.cc.old	2008-04-21 14:36:27.261023151 +0100
-+++ libstdc++-v3/src/complex_io.cc	2008-04-21 14:36:36.534232802 +0100
-@@ -27,6 +27,7 @@
- // invalidate any other reasons why the executable file might be covered by
- // the GNU General Public License.
- 
-+#include <cstdlib>
- #include <complex>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/src/ctype.cc.old	2008-04-21 14:40:06.994312017 +0100
-+++ libstdc++-v3/src/ctype.cc	2008-04-21 14:40:18.218220665 +0100
-@@ -26,6 +26,7 @@
- // invalidate any other reasons why the executable file might be covered by
- // the GNU General Public License.
- 
-+#include <cstdlib>
- #include <locale>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/src/globals_io.cc.old	2008-04-21 14:47:42.230023258 +0100
-+++ libstdc++-v3/src/globals_io.cc	2008-04-21 14:47:52.749297097 +0100
-@@ -27,6 +27,7 @@
- // the GNU General Public License.
- 
- #include "bits/c++config.h"
-+#include <cstdlib>
- #include <fstream>
- #include <istream>
- #include <ostream>
---- libstdc++-v3/src/ios.cc.old	2008-04-21 14:51:32.364023391 +0100
-+++ libstdc++-v3/src/ios.cc	2008-04-21 14:51:39.371196232 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882: 27.4  Iostreams base classes
- //
- 
-+#include <cstdlib>
- #include <ios>
- #include <limits>
- 
---- libstdc++-v3/src/ios_failure.cc.old	2008-04-21 14:53:10.759023042 +0100
-+++ libstdc++-v3/src/ios_failure.cc	2008-04-21 14:53:40.197127646 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882: 27.4.2.1.1  Class ios_base::failure
- //
- 
-+#include <cstdlib>
- #include <ios>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/src/ios_init.cc.old	2008-04-21 14:55:53.181023355 +0100
-+++ libstdc++-v3/src/ios_init.cc	2008-04-21 14:56:01.407485842 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882: 27.4  Iostreams base classes
- //
- 
-+#include <cstdlib>
- #include <ios>
- #include <ostream>
- #include <istream>
---- libstdc++-v3/src/ios_locale.cc.old	2008-04-21 15:04:38.355183857 +0100
-+++ libstdc++-v3/src/ios_locale.cc	2008-04-21 15:04:47.456159205 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882: 27.4  Iostreams base classes
- //
- 
-+#include <cstdlib>
- #include <ios>
- #include <locale>
- 
---- libstdc++-v3/src/locale_facets.cc.old	2008-04-21 15:10:19.610023164 +0100
-+++ libstdc++-v3/src/locale_facets.cc	2008-04-21 15:10:26.952034403 +0100
-@@ -26,6 +26,7 @@
- // invalidate any other reasons why the executable file might be covered by
- // the GNU General Public License.
- 
-+#include <cstdlib>
- #include <locale>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/src/strstream.cc.old	2008-04-21 15:17:36.006071207 +0100
-+++ libstdc++-v3/src/strstream.cc	2008-04-21 15:17:43.447641937 +0100
-@@ -46,6 +46,7 @@
- // MAY BE REMOVED in a future standard revision.  You should use the
- // header <sstream> instead.
- 
-+#include <cstdlib>
- #include <strstream>
- #include <algorithm>
- #include <new>
---- libstdc++-v3/src/fstream-inst.cc.old	2008-04-21 15:25:14.168032671 +0100
-+++ libstdc++-v3/src/fstream-inst.cc	2008-04-21 15:25:24.605060960 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882:
- //
- 
-+#include <cstdlib>
- #include <fstream>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/src/ios-inst.cc.old	2008-04-21 15:40:43.642023146 +0100
-+++ libstdc++-v3/src/ios-inst.cc	2008-04-21 15:40:51.723051414 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882:
- //
- 
-+#include <cstdlib>
- #include <ios>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/src/iostream-inst.cc.old	2008-04-21 15:55:15.625023267 +0100
-+++ libstdc++-v3/src/iostream-inst.cc	2008-04-21 15:55:23.629058393 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882:
- //
- 
-+#include <cstdlib>
- #include <iomanip>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/src/istream-inst.cc.old	2008-04-21 15:59:50.862024439 +0100
-+++ libstdc++-v3/src/istream-inst.cc	2008-04-21 15:59:59.603028397 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882:
- //
- 
-+#include <cstdlib>
- #include <istream>
- #include <iomanip>
- 
---- libstdc++-v3/src/istream.cc.old	2008-04-21 16:03:55.949023206 +0100
-+++ libstdc++-v3/src/istream.cc	2008-04-21 16:04:03.746026447 +0100
-@@ -31,6 +31,7 @@
- // ISO C++ 14882: 27.6.1  Input streams
- //
- 
-+#include <cstdlib>
- #include <istream>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/src/locale-inst.cc.old	2008-04-21 16:07:06.705023144 +0100
-+++ libstdc++-v3/src/locale-inst.cc	2008-04-21 16:07:14.922226343 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882: 22.1  Locales
- //
- 
-+#include <cstdlib>
- #include <locale>
- 
- // Instantiation configuration.
---- libstdc++-v3/src/ostream-inst.cc.old	2008-04-21 16:19:19.443023243 +0100
-+++ libstdc++-v3/src/ostream-inst.cc	2008-04-21 16:19:26.505037357 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882:
- //
- 
-+#include <cstdlib>
- #include <ostream>
- #include <iomanip>
- 
---- libstdc++-v3/src/sstream-inst.cc.old	2008-04-21 16:22:53.830023256 +0100
-+++ libstdc++-v3/src/sstream-inst.cc	2008-04-21 16:23:01.792239858 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882:
- //
- 
-+#include <cstdlib>
- #include <sstream>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/src/streambuf-inst.cc.old	2008-04-21 16:27:18.648023102 +0100
-+++ libstdc++-v3/src/streambuf-inst.cc	2008-04-21 16:27:28.394022870 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882:
- //
- 
-+#include <cstdlib>
- #include <ios>
- #include <streambuf>
- 
---- libstdc++-v3/src/streambuf.cc.old	2008-04-21 16:32:11.191078470 +0100
-+++ libstdc++-v3/src/streambuf.cc	2008-04-21 16:32:20.434047649 +0100
-@@ -31,6 +31,7 @@
- // ISO C++ 14882: 27.5  Stream buffers
- //
- 
-+#include <cstdlib>
- #include <streambuf>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/config/locale/generic/codecvt_members.cc.old	2008-04-21 16:40:52.235023128 +0100
-+++ libstdc++-v3/config/locale/generic/codecvt_members.cc	2008-04-21 16:41:01.248427209 +0100
-@@ -33,6 +33,7 @@
- 
- // Written by Benjamin Kosnik <bkoz@××××××.com>
- 
-+#include <cstdlib>
- #include <locale>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/config/locale/generic/collate_members.cc.old	2008-04-21 16:42:19.265348380 +0100
-+++ libstdc++-v3/config/locale/generic/collate_members.cc	2008-04-21 16:42:25.552040967 +0100
-@@ -33,6 +33,7 @@
- 
- // Written by Benjamin Kosnik <bkoz@××××××.com>
- 
-+#include <cstdlib>
- #include <locale>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/config/locale/generic/ctype_members.cc.old	2008-04-21 16:49:06.726023078 +0100
-+++ libstdc++-v3/config/locale/generic/ctype_members.cc	2008-04-21 16:49:18.212045558 +0100
-@@ -33,6 +33,7 @@
- 
- // Written by Benjamin Kosnik <bkoz@××××××.com>
- 
-+#include <cstdlib>
- #include <locale>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/config/locale/generic/messages_members.cc.old	2008-04-21 16:51:46.237348712 +0100
-+++ libstdc++-v3/config/locale/generic/messages_members.cc	2008-04-21 16:51:55.015221637 +0100
-@@ -33,6 +33,7 @@
- 
- // Written by Benjamin Kosnik <bkoz@××××××.com>
- 
-+#include <cstdlib>
- #include <locale>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/config/locale/generic/monetary_members.cc.old	2008-04-21 16:53:14.893023165 +0100
-+++ libstdc++-v3/config/locale/generic/monetary_members.cc	2008-04-21 16:53:22.350043513 +0100
-@@ -33,6 +33,7 @@
- 
- // Written by Benjamin Kosnik <bkoz@××××××.com>
- 
-+#include <cstdlib>
- #include <locale>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/config/locale/generic/numeric_members.cc.old	2008-04-21 16:54:11.077212480 +0100
-+++ libstdc++-v3/config/locale/generic/numeric_members.cc	2008-04-21 16:53:32.618266080 +0100
-@@ -33,6 +33,7 @@
- 
- // Written by Benjamin Kosnik <bkoz@××××××.com>
- 
-+#include <cstdlib>
- #include <locale>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/config/locale/generic/time_members.cc.old	2008-04-21 16:54:00.835099080 +0100
-+++ libstdc++-v3/config/locale/generic/time_members.cc	2008-04-21 16:53:41.260024731 +0100
-@@ -34,6 +34,7 @@
- 
- // Written by Benjamin Kosnik <bkoz@××××××.com>
- 
-+#include <cstdlib>
- #include <locale>
- 
- _GLIBCXX_BEGIN_NAMESPACE(std)
---- libstdc++-v3/config/io/basic_file_stdio.cc.old	2008-04-21 17:00:09.629307442 +0100
-+++ libstdc++-v3/config/io/basic_file_stdio.cc	2008-04-21 16:59:58.512314844 +0100
-@@ -32,6 +32,7 @@
- // ISO C++ 14882: 27.8  File-based streams
- //
- 
-+#include <cstdlib>
- #include <bits/basic_file.h>
- #include <fcntl.h>
- #include <errno.h>
---- gcc/cp/g++spec.c.old	2008-06-05 11:12:02.252475943 +0100
-+++ gcc/cp/g++spec.c	2008-06-05 11:12:49.557473133 +0100
-@@ -356,6 +356,12 @@
- 	}
- #endif
-     }
-+#ifdef __MINT__
-+  generate_option (OPT_l, "pthread", 1,
-+                           CL_DRIVER, &new_decoded_options[j]);
-+  added_libraries++;
-+  j++;
-+#endif
-   if (saw_math)
-     new_decoded_options[j++] = *saw_math;
-   else if (library > 0 && need_math)
---- libstdc++-v3/include/c_global/cstdlib.old	2008-06-05 11:15:10.644432810 +0100
-+++ libstdc++-v3/include/c_global/cstdlib	2008-06-05 11:15:43.703707876 +0100
-@@ -97,7 +97,11 @@
- #undef strtod
- #undef strtol
- #undef strtoul
-+#if _POSIX_THREAD_SYSCALL_SOFT && !defined(_PTHREAD_PRIVATE)
-+/* don't undefine system as we're using libpthread */
-+#else
- #undef system
-+#endif
- #undef wcstombs
- #undef wctomb
- 
---- libstdc++-v3/include/c_std/cstdlib.old	2008-06-05 11:15:10.644432810 +0100
-+++ libstdc++-v3/include/c_std/cstdlib	2008-06-05 11:15:43.703707876 +0100
-@@ -97,7 +97,11 @@
- #undef strtod
- #undef strtol
- #undef strtoul
-+#if _POSIX_THREAD_SYSCALL_SOFT && !defined(_PTHREAD_PRIVATE)
-+/* don't undefine system as we're using libpthread */
-+#else
- #undef system
-+#endif
- #undef wcstombs
- #undef wctomb
- 

diff --git a/sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint2.patch b/sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint2.patch
deleted file mode 100644
index d60258eeca..0000000000
--- a/sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint2.patch
+++ /dev/null
@@ -1,1259 +0,0 @@
-diff -aurN gcc-4.6.3/config-ml.in gcc-4.6.3-mint-20120503/config-ml.in
---- gcc-4.6.3/config-ml.in	2010-11-19 21:25:49.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/config-ml.in	2012-05-03 18:23:00.890625000 +0200
-@@ -351,6 +351,23 @@
- 	    esac
- 	  done
- 	fi
-+	case "${host}" in
-+	  *-*-mint*)
-+	    case "${srcdir}" in
-+	      */libgcc ) : ;;
-+	      *)
-+	        old_multidirs="${multidirs}"
-+	        multidirs=""
-+	        for x in ${old_multidirs}; do
-+		  case "$x" in
-+		    *mshort ) : ;;
-+		    *) multidirs="${multidirs} ${x}" ;;
-+		  esac
-+		done
-+		;;
-+	    esac
-+	    ;;
-+	esac
- 	;;
- mips*-*-*)
- 	if [ x$enable_single_float = xno ]
-diff -aurN gcc-4.6.3/configure gcc-4.6.3-mint-20120503/configure
---- gcc-4.6.3/configure	2011-12-18 11:03:44.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/configure	2012-05-03 18:23:00.937500000 +0200
-@@ -3077,6 +3077,9 @@
-     *-*-freebsd*)
-         # Enable libmudflap by default in FreeBSD.
- 	;;
-+    *-*-mint*)
-+        # Enable libmudflap by default in MiNT.
-+	;;
-     *)
-         # Disable it by default everywhere else.
- 	noconfigdirs="$noconfigdirs target-libmudflap"
-@@ -3449,6 +3452,9 @@
-   m68k-*-coff*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-     ;;
-+  m68k-*-mint*)
-+    noconfigdirs="$noconfigdirs target-libiberty ${libgcj}"
-+    ;;
-   m68*-*-* | fido-*-*)
-     libgloss_dir=m68k
-     ;;
-diff -aurN gcc-4.6.3/configure.ac gcc-4.6.3-mint-20120503/configure.ac
---- gcc-4.6.3/configure.ac	2011-11-18 12:45:44.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/configure.ac	2012-05-03 18:23:00.937500000 +0200
-@@ -523,6 +523,9 @@
-     *-*-freebsd*)
-         # Enable libmudflap by default in FreeBSD.
- 	;;
-+    *-*-mint*)
-+        # Enable libmudflap by default in MiNT.
-+	;;
-     *)
-         # Disable it by default everywhere else.
- 	noconfigdirs="$noconfigdirs target-libmudflap"
-@@ -895,6 +898,9 @@
-   m68k-*-coff*)
-     noconfigdirs="$noconfigdirs ${libgcj}"
-     ;;
-+  m68k-*-mint*)
-+    noconfigdirs="$noconfigdirs target-libiberty ${libgcj}"
-+    ;;
-   m68*-*-* | fido-*-*)
-     libgloss_dir=m68k
-     ;;
-diff -aurN gcc-4.6.3/gcc/config/m68k/lb1sf68.asm gcc-4.6.3-mint-20120503/gcc/config/m68k/lb1sf68.asm
---- gcc-4.6.3/gcc/config/m68k/lb1sf68.asm	2009-10-02 13:20:51.000000000 +0200
-+++ gcc-4.6.3-mint-20120503/gcc/config/m68k/lb1sf68.asm	2012-05-03 18:23:00.953125000 +0200
-@@ -666,7 +666,9 @@
- 	.globl SYM (__negdf2)
- 	.globl SYM (__cmpdf2)
- 	.globl SYM (__cmpdf2_internal)
-+#ifdef __ELF__
- 	.hidden SYM (__cmpdf2_internal)
-+#endif
- 
- 	.text
- 	.even
-@@ -2581,7 +2583,9 @@
- 	.globl SYM (__negsf2)
- 	.globl SYM (__cmpsf2)
- 	.globl SYM (__cmpsf2_internal)
-+#ifdef __ELF__
- 	.hidden SYM (__cmpsf2_internal)
-+#endif
- 
- | These are common routines to return and signal exceptions.	
- 
-diff -aurN gcc-4.6.3/gcc/config/m68k/m68k.h gcc-4.6.3-mint-20120503/gcc/config/m68k/m68k.h
---- gcc-4.6.3/gcc/config/m68k/m68k.h	2010-11-22 02:57:50.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/gcc/config/m68k/m68k.h	2012-05-03 18:23:00.953125000 +0200
-@@ -138,7 +138,10 @@
- 	}								\
- 									\
-       if (TARGET_68881)							\
--	builtin_define ("__HAVE_68881__");				\
-+	{								\
-+	  builtin_define ("__HAVE_68881__");				\
-+	  builtin_define ("__M68881__"); /* Non-standard */		\
-+	}								\
- 									\
-       if (TARGET_COLDFIRE)						\
- 	{								\
-diff -aurN gcc-4.6.3/gcc/config/m68k/math-68881.h gcc-4.6.3-mint-20120503/gcc/config/m68k/math-68881.h
---- gcc-4.6.3/gcc/config/m68k/math-68881.h	2004-02-09 01:48:13.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/gcc/config/m68k/math-68881.h	2012-05-03 18:23:00.953125000 +0200
-@@ -44,6 +44,16 @@
- 
- #include <errno.h>
- 
-+/* GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
-+   inline semantics, unless -fgnu89-inline is used.  */
-+#ifdef __cplusplus
-+# define __MATH_68881_INLINE inline
-+#elif defined __GNUC_STDC_INLINE__
-+# define __MATH_68881_INLINE extern __inline __attribute__ ((__gnu_inline__))
-+#else
-+# define __MATH_68881_INLINE extern __inline
-+#endif
-+
- #undef HUGE_VAL
- #ifdef __sun__
- /* The Sun assembler fails to handle the hex constant in the usual defn.  */
-@@ -64,7 +74,7 @@
- })
- #endif
- 
--__inline extern double
-+__MATH_68881_INLINE double
- sin (double x)
- {
-   double value;
-@@ -75,7 +85,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- cos (double x)
- {
-   double value;
-@@ -86,7 +96,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- tan (double x)
- {
-   double value;
-@@ -97,7 +107,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- asin (double x)
- {
-   double value;
-@@ -108,7 +118,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- acos (double x)
- {
-   double value;
-@@ -119,7 +129,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- atan (double x)
- {
-   double value;
-@@ -130,7 +140,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- atan2 (double y, double x)
- {
-   double pi, pi_over_2;
-@@ -187,7 +197,7 @@
-     }
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- sinh (double x)
- {
-   double value;
-@@ -198,7 +208,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- cosh (double x)
- {
-   double value;
-@@ -209,7 +219,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- tanh (double x)
- {
-   double value;
-@@ -220,7 +230,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- atanh (double x)
- {
-   double value;
-@@ -231,7 +241,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- exp (double x)
- {
-   double value;
-@@ -242,7 +252,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- expm1 (double x)
- {
-   double value;
-@@ -253,7 +263,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- log (double x)
- {
-   double value;
-@@ -264,7 +274,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- log1p (double x)
- {
-   double value;
-@@ -275,7 +285,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- log10 (double x)
- {
-   double value;
-@@ -286,7 +296,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- sqrt (double x)
- {
-   double value;
-@@ -297,13 +307,13 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- hypot (double x, double y)
- {
-   return sqrt (x*x + y*y);
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- pow (double x, double y)
- {
-   if (x > 0)
-@@ -352,7 +362,7 @@
-     }
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- fabs (double x)
- {
-   double value;
-@@ -363,7 +373,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- ceil (double x)
- {
-   int rounding_mode, round_up;
-@@ -385,7 +395,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- floor (double x)
- {
-   int rounding_mode, round_down;
-@@ -408,7 +418,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- rint (double x)
- {
-   int rounding_mode, round_nearest;
-@@ -430,7 +440,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- fmod (double x, double y)
- {
-   double value;
-@@ -442,7 +452,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- drem (double x, double y)
- {
-   double value;
-@@ -454,7 +464,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- scalb (double x, int n)
- {
-   double value;
-@@ -466,7 +476,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- logb (double x)
- {
-   double exponent;
-@@ -477,7 +487,7 @@
-   return exponent;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- ldexp (double x, int n)
- {
-   double value;
-@@ -489,7 +499,7 @@
-   return value;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- frexp (double x, int *exp)
- {
-   double float_exponent;
-@@ -514,7 +524,7 @@
-   return mantissa;
- }
- 
--__inline extern double
-+__MATH_68881_INLINE double
- modf (double x, double *ip)
- {
-   double temp;
-diff -aurN gcc-4.6.3/gcc/config/m68k/mint.h gcc-4.6.3-mint-20120503/gcc/config/m68k/mint.h
---- gcc-4.6.3/gcc/config/m68k/mint.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/gcc/config/m68k/mint.h	2012-05-03 18:23:00.968750000 +0200
-@@ -0,0 +1,176 @@
-+/* Definitions of target machine for GNU compiler.
-+   Atari ST TOS/MiNT.
-+   Copyright (C) 1994, 1995, 2007, 2008, 2009, 2010, 2011
-+   Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+/* Here are four prefixes that are used by asm_fprintf to
-+   facilitate customization for alternate assembler syntaxes.
-+   Machines with no likelihood of an alternate syntax need not
-+   define these and need not use asm_fprintf.  */
-+
-+/* The prefix for register names.  Note that REGISTER_NAMES
-+   is supposed to include this prefix. Also note that this is NOT an
-+   fprintf format string, it is a literal string */
-+
-+#undef REGISTER_PREFIX
-+#define REGISTER_PREFIX "%"
-+
-+/* The prefix for local (compiler generated) labels.
-+   These labels will not appear in the symbol table.  */
-+
-+#undef LOCAL_LABEL_PREFIX
-+#define LOCAL_LABEL_PREFIX "."
-+
-+#undef ASM_COMMENT_START
-+#define ASM_COMMENT_START "|"
-+
-+#undef WCHAR_TYPE
-+#define WCHAR_TYPE "short unsigned int"
-+
-+#undef WCHAR_TYPE_SIZE
-+#define WCHAR_TYPE_SIZE SHORT_TYPE_SIZE
-+
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()		\
-+  do						\
-+    {						\
-+      builtin_define ("__MINT__");		\
-+      builtin_define_std ("atarist");		\
-+      builtin_assert ("machine=atari");		\
-+      builtin_assert ("system=mint");		\
-+    }						\
-+  while (0)
-+
-+/* The following defines are nonstandard
-+   and are kept only for compatibility
-+   with older versions of GCC for MiNT.  */
-+
-+#undef CPP_SPEC
-+#define CPP_SPEC			\
-+  "%{m68000:-D__M68000__} "		\
-+  "%{mc68020:-D__M68020__} "		\
-+  "%{m68020:-D__M68020__} "		\
-+  "%{m68030:-D__M68020__} "		\
-+  "%{m68040:-D__M68020__} "		\
-+  "%{m68060:-D__M68020__} "		\
-+  "%{m68020-40:-D__M68020__} "		\
-+  "%{m68020-60:-D__M68020__} "		\
-+  "%{!m680*:%{!mc680*:-D__M68000__}} "	\
-+  "%{mshort:-D__MSHORT__}"
-+
-+#define STARTFILE_SPEC	"%{pg|p|profile:gcrt0.o%s;:crt0.o%s}"
-+#define LIB_SPEC	"-lc"
-+
-+/* Every structure or union's size must be a multiple of 2 bytes.  */
-+#define STRUCTURE_SIZE_BOUNDARY 16
-+
-+/* The -g option generates stabs debug information.  */
-+#define DBX_DEBUGGING_INFO 1
-+
-+/* This is the assembler directive to equate two values.  */
-+#undef SET_ASM_OP
-+#define SET_ASM_OP		"\t.set\t"
-+
-+/* This is how we tell the assembler that a symbol is weak.  */
-+#undef ASM_WEAKEN_LABEL
-+#define ASM_WEAKEN_LABEL(FILE,NAME) \
-+  do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \
-+       fputc ('\n', FILE); } while (0)
-+
-+/* Don't default to pcc-struct-return, because gcc is the only compiler, and
-+   we want to retain compatibility with older gcc versions.  */
-+#define DEFAULT_PCC_STRUCT_RETURN 0
-+
-+/* The system headers are C++-aware.  */
-+#define NO_IMPLICIT_EXTERN_C
-+
-+/* By default, the vtable entries are void pointers, the so the alignment
-+   is the same as pointer alignment.  The value of this macro specifies
-+   the alignment of the vtable entry in bits.  It should be defined only
-+   when special alignment is necessary.
-+
-+   MiNT: The default value of 32 is too much and unsupported by a.out-mintprg.
-+*/
-+#define TARGET_VTABLE_ENTRY_ALIGN 16
-+
-+/* If we have a definition of INCOMING_RETURN_ADDR_RTX, assume that
-+   the rest of the DWARF 2 frame unwind support is also provided.
-+   
-+   MiNT: DWARF 2 frame unwind is not supported by a.out-mint.
-+*/
-+#define DWARF2_UNWIND_INFO 0
-+
-+/* config/m68k.md has an explicit reference to the program counter,
-+   prefix this by the register prefix.  */
-+
-+#define ASM_RETURN_CASE_JUMP				\
-+  do {							\
-+    if (TARGET_COLDFIRE)				\
-+      {							\
-+	if (ADDRESS_REG_P (operands[0]))		\
-+	  return "jmp %%pc@(2,%0:l)";			\
-+	else						\
-+	  return "ext%.l %0\n\tjmp %%pc@(2,%0:l)";	\
-+      }							\
-+    else						\
-+      return "jmp %%pc@(2,%0:w)";			\
-+  } while (0)
-+
-+/* The ADDR_DIFF_VEC must exactly follow the previous instruction.  */
-+
-+#undef ADDR_VEC_ALIGN
-+#define ADDR_VEC_ALIGN(ADDR_VEC) 0
-+
-+/* If defined, a C expression whose value is a string containing the
-+   assembler operation to identify the following data as uninitialized global
-+   data.  */
-+
-+#define BSS_SECTION_ASM_OP "\t.bss"
-+
-+/* A C statement (sans semicolon) to output to the stdio stream
-+   FILE the assembler definition of uninitialized global DECL named
-+   NAME whose size is SIZE bytes and alignment is ALIGN bytes.
-+   Try to use asm_output_aligned_bss to implement this macro.  */
-+
-+#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
-+  asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
-+
-+/* Disable -fpic and -fPIC since bsr.l _label@PLTPC
-+   is unsupported by the assembler.  */
-+
-+#undef  SUBTARGET_OVERRIDE_OPTIONS
-+#define SUBTARGET_OVERRIDE_OPTIONS					\
-+do {									\
-+  if (flag_pic && !TARGET_PCREL)					\
-+      error ("-f%s is not supported on this target",			\
-+	       (flag_pic > 1) ? "PIC" : "pic");				\
-+} while (0)
-+
-+
-+/* Workaround for GCC bug #35067 about multiple thunks.  */
-+
-+#undef MAKE_DECL_ONE_ONLY
-+#define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1)
-+
-+/* Avoid requiring -static with -fmudflap like in config/bfin/uclinux.h */
-+#define MFWRAP_SPEC " %{fmudflap|fmudflapth: \
-+ --wrap=malloc --wrap=free --wrap=calloc --wrap=realloc\
-+ --wrap=mmap --wrap=munmap --wrap=alloca\
-+ %{fmudflapth: --wrap=pthread_create\
-+}} %{fmudflap|fmudflapth: --wrap=main}"
-diff -aurN gcc-4.6.3/gcc/config/m68k/t-mint gcc-4.6.3-mint-20120503/gcc/config/m68k/t-mint
---- gcc-4.6.3/gcc/config/m68k/t-mint	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/gcc/config/m68k/t-mint	2012-05-03 18:23:00.968750000 +0200
-@@ -0,0 +1,27 @@
-+# 
-+# Use multiple libraries
-+# 
-+
-+MULTILIB_OPTIONS = m68020-60 mshort
-+
-+MULTILIB_DIRNAMES = m68020-60 mshort
-+
-+MULTILIB_MATCHES = \
-+	m68020-60=m68881 \
-+	m68020-60=m68020 \
-+	m68020-60=m68020-40 \
-+	m68020-60=mc68020 \
-+	m68020-60=m68030 \
-+	m68020-60=m68040 \
-+	m68020-60=m68060 \
-+	m68020-60=mcpu?68020 \
-+	m68020-60=mcpu?68030 \
-+	m68020-60=mcpu?68040 \
-+	m68020-60=mcpu?68060 \
-+	m68020-60=march?68020 \
-+	m68020-60=march?68030 \
-+	m68020-60=march?68040 \
-+	m68020-60=march?68060
-+
-+LIBGCC = stmp-multilib
-+INSTALL_LIBGCC = install-multilib
-diff -aurN gcc-4.6.3/gcc/config.gcc gcc-4.6.3-mint-20120503/gcc/config.gcc
---- gcc-4.6.3/gcc/config.gcc	2011-07-22 18:44:50.000000000 +0200
-+++ gcc-4.6.3-mint-20120503/gcc/config.gcc	2012-05-03 18:23:00.968750000 +0200
-@@ -1805,6 +1805,15 @@
- 	    tmake_file="$tmake_file m68k/t-slibgcc-elf-ver"
- 	fi
- 	;;
-+m68k-*-mint*)
-+	default_m68k_cpu=68000
-+	default_cf_cpu=5475
-+	tm_file="${tm_file} m68k/mint.h"
-+	tm_defines="${tm_defines} MOTOROLA=1"
-+	tmake_file="m68k/t-floatlib m68k/t-mint"
-+	gas=yes
-+	gnu_ld=yes
-+	;;
- m68k-*-rtems*)
- 	default_m68k_cpu=68020
- 	default_cf_cpu=5206
-diff -aurN gcc-4.6.3/gcc/df-problems.c gcc-4.6.3-mint-20120503/gcc/df-problems.c
---- gcc-4.6.3/gcc/df-problems.c	2011-07-07 21:10:01.000000000 +0200
-+++ gcc-4.6.3-mint-20120503/gcc/df-problems.c	2012-05-03 18:23:00.968750000 +0200
-@@ -4024,7 +4024,10 @@
- 	  if (bitmap_intersect_p (merge_set, test_use)
- 	      || bitmap_intersect_p (merge_use, test_set))
- 	    break;
--	  max_to = insn;
-+#ifdef HAVE_cc0
-+	  if (!sets_cc0_p (insn))
-+#endif
-+	    max_to = insn;
- 	}
-       next = NEXT_INSN (insn);
-       if (insn == to)
-@@ -4061,7 +4064,11 @@
-     {
-       if (NONDEBUG_INSN_P (insn))
- 	{
--	  if (!bitmap_intersect_p (test_set, local_merge_live))
-+	  if (!bitmap_intersect_p (test_set, local_merge_live)
-+#ifdef HAVE_cc0
-+	      && !sets_cc0_p (insn)
-+#endif
-+	      )
- 	    {
- 	      max_to = insn;
- 	      break;
-diff -aurN gcc-4.6.3/libdecnumber/decNumberLocal.h gcc-4.6.3-mint-20120503/libdecnumber/decNumberLocal.h
---- gcc-4.6.3/libdecnumber/decNumberLocal.h	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.6.3-mint-20120503/libdecnumber/decNumberLocal.h	2012-05-03 18:23:00.984375000 +0200
-@@ -188,7 +188,7 @@
-   #if (DECNUMMAXE != DEC_MAX_EMAX)
-     #error Maximum exponent mismatch
-   #endif
--  #if (DECNUMMINE != DEC_MIN_EMIN)
-+  #if !(DECNUMMINE == DEC_MIN_EMIN) /* gcc 2.95.3 has bug in '!=' operator for negative constants */
-     #error Minimum exponent mismatch
-   #endif
- 
-diff -aurN gcc-4.6.3/libgcc/config.host gcc-4.6.3-mint-20120503/libgcc/config.host
---- gcc-4.6.3/libgcc/config.host	2011-11-23 23:15:54.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/libgcc/config.host	2012-05-03 18:23:00.984375000 +0200
-@@ -387,6 +387,8 @@
- 				# with ELF format using glibc 2
- 				# aka the GNU/Linux C library 6.
- 	;;
-+m68k-*-mint*)
-+	;;
- m68k-*-rtems*)
- 	;;
- mcore-*-elf)
-diff -aurN gcc-4.6.3/libiberty/configure gcc-4.6.3-mint-20120503/libiberty/configure
---- gcc-4.6.3/libiberty/configure	2010-11-21 04:29:27.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/libiberty/configure	2012-05-03 18:23:01.031250000 +0200
-@@ -4850,6 +4850,7 @@
- if [ "${shared}" = "yes" ]; then
-   case "${host}" in
-     *-*-cygwin*)	;;
-+    *-*-mint*)		;;
-     alpha*-*-linux*)	PICFLAG=-fPIC ;;
-     arm*-*-*)		PICFLAG=-fPIC ;;
-     hppa*-*-*)		PICFLAG=-fPIC ;;
-diff -aurN gcc-4.6.3/libiberty/configure.ac gcc-4.6.3-mint-20120503/libiberty/configure.ac
---- gcc-4.6.3/libiberty/configure.ac	2010-11-21 04:29:27.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/libiberty/configure.ac	2012-05-03 18:23:01.031250000 +0200
-@@ -201,6 +201,7 @@
- if [[ "${shared}" = "yes" ]]; then
-   case "${host}" in
-     *-*-cygwin*)	;;
-+    *-*-mint*)		;;
-     alpha*-*-linux*)	PICFLAG=-fPIC ;;
-     arm*-*-*)		PICFLAG=-fPIC ;;
-     hppa*-*-*)		PICFLAG=-fPIC ;;
-diff -aurN gcc-4.6.3/libiberty/hex.c gcc-4.6.3-mint-20120503/libiberty/hex.c
---- gcc-4.6.3/libiberty/hex.c	2007-01-31 21:05:50.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/libiberty/hex.c	2012-05-03 18:23:01.031250000 +0200
-@@ -24,7 +24,7 @@
- #include "libiberty.h"
- #include "safe-ctype.h" /* for HOST_CHARSET_ASCII */
- 
--#if EOF != -1
-+#if !(EOF == -1)	/* gcc 2.95.3 has bug in '!=' operator for negative constants */
-  #error "hex.c requires EOF == -1"
- #endif
- 
-diff -aurN gcc-4.6.3/libiberty/safe-ctype.c gcc-4.6.3-mint-20120503/libiberty/safe-ctype.c
---- gcc-4.6.3/libiberty/safe-ctype.c	2005-05-10 17:33:18.000000000 +0200
-+++ gcc-4.6.3-mint-20120503/libiberty/safe-ctype.c	2012-05-03 18:23:01.031250000 +0200
-@@ -119,7 +119,7 @@
- #include <safe-ctype.h>
- #include <stdio.h>  /* for EOF */
- 
--#if EOF != -1
-+#if !(EOF == -1)	/* gcc 2.95.3 has bug in '!=' operator for negative constants */
-  #error "<safe-ctype.h> requires EOF == -1"
- #endif
- 
-diff -aurN gcc-4.6.3/libmudflap/mf-hooks2.c gcc-4.6.3-mint-20120503/libmudflap/mf-hooks2.c
---- gcc-4.6.3/libmudflap/mf-hooks2.c	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.6.3-mint-20120503/libmudflap/mf-hooks2.c	2012-05-03 18:23:01.031250000 +0200
-@@ -1668,6 +1668,8 @@
- }
- 
- 
-+#ifdef HAVE_DLFCN_H
-+
- WRAPPER2(void *, dlopen, const char *path, int flags)
- {
-   void *p;
-@@ -1735,6 +1737,8 @@
-   return p;
- }
- 
-+#endif /* HAVE_DLFCN_H */
-+
- 
- #if defined (HAVE_SYS_IPC_H) && defined (HAVE_SYS_SEM_H) && defined (HAVE_SYS_SHM_H)
- 
-diff -aurN gcc-4.6.3/libmudflap/mf-runtime.h gcc-4.6.3-mint-20120503/libmudflap/mf-runtime.h
---- gcc-4.6.3/libmudflap/mf-runtime.h	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.6.3-mint-20120503/libmudflap/mf-runtime.h	2012-05-03 18:23:01.046875000 +0200
-@@ -97,6 +97,7 @@
-    instrumented modules are meant to be affected.  */
- 
- #ifdef _MUDFLAP
-+#ifndef __USER_LABEL_PREFIX__
- #pragma redefine_extname memcpy __mfwrap_memcpy
- #pragma redefine_extname memmove __mfwrap_memmove
- #pragma redefine_extname memset __mfwrap_memset
-@@ -230,6 +231,141 @@
- #pragma redefine_extname getprotoent __mfwrap_getprotoent
- #pragma redefine_extname getprotobyname __mfwrap_getprotobyname
- #pragma redefine_extname getprotobynumber __mfwrap_getprotobynumber
-+#else
-+#pragma redefine_extname memcpy ___mfwrap_memcpy
-+#pragma redefine_extname memmove ___mfwrap_memmove
-+#pragma redefine_extname memset ___mfwrap_memset
-+#pragma redefine_extname memcmp ___mfwrap_memcmp
-+#pragma redefine_extname memchr ___mfwrap_memchr
-+#pragma redefine_extname memrchr ___mfwrap_memrchr
-+#pragma redefine_extname strcpy ___mfwrap_strcpy
-+#pragma redefine_extname strncpy ___mfwrap_strncpy
-+#pragma redefine_extname strcat ___mfwrap_strcat
-+#pragma redefine_extname strncat ___mfwrap_strncat
-+#pragma redefine_extname strcmp ___mfwrap_strcmp
-+#pragma redefine_extname strcasecmp ___mfwrap_strcasecmp
-+#pragma redefine_extname strncmp ___mfwrap_strncmp
-+#pragma redefine_extname strncasecmp ___mfwrap_strncasecmp
-+#pragma redefine_extname strdup ___mfwrap_strdup
-+#pragma redefine_extname strndup ___mfwrap_strndup
-+#pragma redefine_extname strchr ___mfwrap_strchr
-+#pragma redefine_extname strrchr ___mfwrap_strrchr
-+#pragma redefine_extname strstr ___mfwrap_strstr
-+#pragma redefine_extname memmem ___mfwrap_memmem
-+#pragma redefine_extname strlen ___mfwrap_strlen
-+#pragma redefine_extname strnlen ___mfwrap_strnlen
-+#pragma redefine_extname bzero ___mfwrap_bzero
-+#pragma redefine_extname bcopy ___mfwrap_bcopy
-+#pragma redefine_extname bcmp ___mfwrap_bcmp
-+#pragma redefine_extname index ___mfwrap_index
-+#pragma redefine_extname rindex ___mfwrap_rindex
-+#pragma redefine_extname asctime ___mfwrap_asctime
-+#pragma redefine_extname ctime ___mfwrap_ctime
-+#pragma redefine_extname gmtime ___mfwrap_gmtime
-+#pragma redefine_extname localtime ___mfwrap_localtime
-+#pragma redefine_extname time ___mfwrap_time
-+#pragma redefine_extname strerror ___mfwrap_strerror
-+#pragma redefine_extname fopen ___mfwrap_fopen
-+#pragma redefine_extname fdopen ___mfwrap_fdopen
-+#pragma redefine_extname freopen ___mfwrap_freopen
-+#pragma redefine_extname fclose ___mfwrap_fclose
-+#pragma redefine_extname fread ___mfwrap_fread
-+#pragma redefine_extname fwrite ___mfwrap_fwrite
-+#pragma redefine_extname fgetc ___mfwrap_fgetc
-+#pragma redefine_extname fgets ___mfwrap_fgets
-+#pragma redefine_extname getc ___mfwrap_getc
-+#pragma redefine_extname gets ___mfwrap_gets
-+#pragma redefine_extname ungetc ___mfwrap_ungetc
-+#pragma redefine_extname fputc ___mfwrap_fputc
-+#pragma redefine_extname fputs ___mfwrap_fputs
-+#pragma redefine_extname putc ___mfwrap_putc
-+#pragma redefine_extname puts ___mfwrap_puts
-+#pragma redefine_extname clearerr ___mfwrap_clearerr
-+#pragma redefine_extname feof ___mfwrap_feof
-+#pragma redefine_extname ferror ___mfwrap_ferror
-+#pragma redefine_extname fileno ___mfwrap_fileno
-+#pragma redefine_extname printf ___mfwrap_printf
-+#pragma redefine_extname fprintf ___mfwrap_fprintf
-+#pragma redefine_extname sprintf ___mfwrap_sprintf
-+#pragma redefine_extname snprintf ___mfwrap_snprintf
-+#pragma redefine_extname vprintf ___mfwrap_vprintf
-+#pragma redefine_extname vfprintf ___mfwrap_vfprintf
-+#pragma redefine_extname vsprintf ___mfwrap_vsprintf
-+#pragma redefine_extname vsnprintf ___mfwrap_vsnprintf
-+#pragma redefine_extname access ___mfwrap_access
-+#pragma redefine_extname remove ___mfwrap_remove
-+#pragma redefine_extname fflush ___mfwrap_fflush
-+#pragma redefine_extname fseek ___mfwrap_fseek
-+#pragma redefine_extname ftell ___mfwrap_ftell
-+#pragma redefine_extname rewind ___mfwrap_rewind
-+#pragma redefine_extname fgetpos ___mfwrap_fgetpos
-+#pragma redefine_extname fsetpos ___mfwrap_fsetpos
-+#pragma redefine_extname stat ___mfwrap_stat
-+#pragma redefine_extname fstat ___mfwrap_fstat
-+#pragma redefine_extname lstat ___mfwrap_lstat
-+#pragma redefine_extname mkfifo ___mfwrap_mkfifo
-+#pragma redefine_extname setvbuf ___mfwrap_setvbuf
-+#pragma redefine_extname setbuf ___mfwrap_setbuf
-+#pragma redefine_extname setbuffer ___mfwrap_setbuffer
-+#pragma redefine_extname setlinebuf ___mfwrap_setlinebuf
-+#pragma redefine_extname opendir ___mfwrap_opendir
-+#pragma redefine_extname closedir ___mfwrap_closedir
-+#pragma redefine_extname readdir ___mfwrap_readdir
-+#pragma redefine_extname recv ___mfwrap_recv
-+#pragma redefine_extname recvfrom ___mfwrap_recvfrom
-+#pragma redefine_extname recvmsg ___mfwrap_recvmsg
-+#pragma redefine_extname send ___mfwrap_send
-+#pragma redefine_extname sendto ___mfwrap_sendto
-+#pragma redefine_extname sendmsg ___mfwrap_sendmsg
-+#pragma redefine_extname setsockopt ___mfwrap_setsockopt
-+#pragma redefine_extname getsockopt ___mfwrap_getsockopt
-+#pragma redefine_extname accept ___mfwrap_accept
-+#pragma redefine_extname bind ___mfwrap_bind
-+#pragma redefine_extname connect ___mfwrap_connect
-+#pragma redefine_extname gethostname ___mfwrap_gethostname
-+#pragma redefine_extname sethostname ___mfwrap_sethostname
-+#pragma redefine_extname gethostbyname ___mfwrap_gethostbyname
-+#pragma redefine_extname wait ___mfwrap_wait
-+#pragma redefine_extname waitpid ___mfwrap_waitpid
-+#pragma redefine_extname popen ___mfwrap_popen
-+#pragma redefine_extname pclose ___mfwrap_pclose
-+#pragma redefine_extname execve ___mfwrap_execve
-+#pragma redefine_extname execv ___mfwrap_execv
-+#pragma redefine_extname execvp ___mfwrap_execvp
-+#pragma redefine_extname system ___mfwrap_system
-+#pragma redefine_extname dlopen ___mfwrap_dlopen
-+#pragma redefine_extname dlerror ___mfwrap_dlerror
-+#pragma redefine_extname dlsym ___mfwrap_dlsym
-+#pragma redefine_extname dlclose ___mfwrap_dlclose
-+#pragma redefine_extname fopen64 ___mfwrap_fopen64
-+#pragma redefine_extname freopen64 ___mfwrap_freopen64
-+#pragma redefine_extname stat64 ___mfwrap_stat64
-+#pragma redefine_extname fseeko64 ___mfwrap_fseeko64
-+#pragma redefine_extname ftello64 ___mfwrap_ftello64
-+#pragma redefine_extname semop ___mfwrap_semop
-+#pragma redefine_extname semctl ___mfwrap_semctl
-+#pragma redefine_extname shmctl ___mfwrap_shmctl
-+#pragma redefine_extname shmat ___mfwrap_shmat
-+#pragma redefine_extname shmdt ___mfwrap_shmdt
-+#pragma redefine_extname __ctype_b_loc ___mfwrap___ctype_b_loc
-+#pragma redefine_extname __ctype_toupper_loc ___mfwrap___ctype_toupper_loc
-+#pragma redefine_extname __ctype_tolower_loc ___mfwrap___ctype_tolower_loc
-+#pragma redefine_extname getlogin ___mfwrap_getlogin
-+#pragma redefine_extname cuserid ___mfwrap_cuserid
-+#pragma redefine_extname getpwnam ___mfwrap_getpwnam
-+#pragma redefine_extname getpwuid ___mfwrap_getpwuid
-+#pragma redefine_extname getgrnam ___mfwrap_getgrnam
-+#pragma redefine_extname getgrgid ___mfwrap_getgrgid
-+#pragma redefine_extname getservent ___mfwrap_getservent
-+#pragma redefine_extname getservbyname ___mfwrap_getservbyname
-+#pragma redefine_extname getservbyport ___mfwrap_getservbyport
-+#pragma redefine_extname gai_strerror ___mfwrap_gai_strerror
-+#pragma redefine_extname getmntent ___mfwrap_getmntent
-+#pragma redefine_extname inet_ntoa ___mfwrap_inet_ntoa
-+#pragma redefine_extname getprotoent ___mfwrap_getprotoent
-+#pragma redefine_extname getprotobyname ___mfwrap_getprotobyname
-+#pragma redefine_extname getprotobynumber ___mfwrap_getprotobynumber
-+#endif
- 
- /* Disable glibc macros.  */
- #define __NO_STRING_INLINES
-diff -aurN gcc-4.6.3/libssp/ssp.c gcc-4.6.3-mint-20120503/libssp/ssp.c
---- gcc-4.6.3/libssp/ssp.c	2009-04-13 12:37:17.000000000 +0200
-+++ gcc-4.6.3-mint-20120503/libssp/ssp.c	2012-05-03 18:23:01.046875000 +0200
-@@ -63,6 +63,9 @@
- #ifdef HAVE_SYSLOG_H
- # include <syslog.h>
- #endif
-+#ifdef __MINT__
-+#include <mint/osbind.h>
-+#endif
- 
- void *__stack_chk_guard = 0;
- 
-@@ -98,6 +101,9 @@
- {
- #ifdef __GNU_LIBRARY__
-   extern char * __progname;
-+#elif defined (__MINT__)
-+  extern char * program_invocation_short_name;
-+  #define __progname program_invocation_short_name
- #else
-   static const char __progname[] = "";
- #endif
-@@ -139,6 +145,9 @@
-     syslog (LOG_CRIT, msg3);
- #endif /* HAVE_SYSLOG_H */
- 
-+#ifdef __MINT__
-+    Pterm(127);
-+#else
-   /* Try very hard to exit.  Note that signals may be blocked preventing
-      the first two options from working.  The use of volatile is here to
-      prevent optimizers from "knowing" that __builtin_trap is called first,
-@@ -160,6 +169,7 @@
-           break;
-         }
-   }
-+#endif
- }
- 
- void
-diff -aurN gcc-4.6.3/libstdc++-v3/config/os/mint/ctype_base.h gcc-4.6.3-mint-20120503/libstdc++-v3/config/os/mint/ctype_base.h
---- gcc-4.6.3/libstdc++-v3/config/os/mint/ctype_base.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/libstdc++-v3/config/os/mint/ctype_base.h	2012-05-03 18:23:01.046875000 +0200
-@@ -0,0 +1,59 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 1997, 1998, 1999, 2003, 2009, 2010
-+// Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 3, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// Under Section 7 of GPL version 3, you are granted additional
-+// permissions described in the GCC Runtime Library Exception, version
-+// 3.1, as published by the Free Software Foundation.
-+
-+// You should have received a copy of the GNU General Public License and
-+// a copy of the GCC Runtime Library Exception along with this program;
-+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+// <http://www.gnu.org/licenses/>.
-+
-+//
-+// ISO C++ 14882: 22.1  Locales
-+//
-+
-+// Mint C types, taken from mintlib-0.57.3/include/ctype.h
-+
-+namespace std _GLIBCXX_VISIBILITY(default)
-+{
-+_GLIBCXX_BEGIN_NAMESPACE_VERSION
-+
-+  /// @brief  Base class for ctype.
-+  struct ctype_base
-+  {
-+    // Non-standard typedefs.
-+    typedef const int* 		__to_type;
-+
-+    // NB: Offsets into ctype<char>::_M_table force a particular size
-+    // on the mask type. Because of this, we don't use an enum.
-+    typedef unsigned int 	mask;
-+    static const mask upper    	= _CTu;
-+    static const mask lower 	= _CTl;
-+    static const mask alpha 	= _CTu | _CTl;
-+    static const mask digit 	= _CTd;
-+    static const mask xdigit 	= _CTx;
-+    static const mask space 	= _CTs;
-+    static const mask print 	= _CTP;
-+    static const mask graph 	= _CTg;
-+    static const mask cntrl 	= _CTc;
-+    static const mask punct 	= _CTp;
-+    static const mask alnum 	= _CTd | _CTu | _CTl ;
-+  };
-+
-+_GLIBCXX_END_NAMESPACE_VERSION
-+} // namespace
-diff -aurN gcc-4.6.3/libstdc++-v3/config/os/mint/ctype_inline.h gcc-4.6.3-mint-20120503/libstdc++-v3/config/os/mint/ctype_inline.h
---- gcc-4.6.3/libstdc++-v3/config/os/mint/ctype_inline.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/libstdc++-v3/config/os/mint/ctype_inline.h	2012-05-03 18:23:01.046875000 +0200
-@@ -0,0 +1,76 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 2000, 2003, 2009, 2010 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 3, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// Under Section 7 of GPL version 3, you are granted additional
-+// permissions described in the GCC Runtime Library Exception, version
-+// 3.1, as published by the Free Software Foundation.
-+
-+// You should have received a copy of the GNU General Public License and
-+// a copy of the GCC Runtime Library Exception along with this program;
-+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+// <http://www.gnu.org/licenses/>.
-+
-+/** @file bits/ctype_inline.h
-+ *  This is an internal header file, included by other library headers.
-+ *  Do not attempt to use it directly. @headername{locale}
-+ */
-+
-+//
-+// ISO C++ 14882: 22.1  Locales
-+//
-+  
-+// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
-+// functions go in ctype.cc
-+  
-+// Mint C types, taken from mintlib-0.57.3/include/ctype.h
-+
-+namespace std _GLIBCXX_VISIBILITY(default)
-+{
-+_GLIBCXX_BEGIN_NAMESPACE_VERSION
-+
-+  bool
-+  ctype<char>::
-+  is(mask __m, char __c) const
-+  { return _ctype[(unsigned char)((__c) + 1)] & __m; }
-+
-+  const char*
-+  ctype<char>::
-+  is(const char* __low, const char* __high, mask* __vec) const
-+  {
-+    while (__low < __high)
-+      *__vec++ = _ctype[(*__low++) + 1] ;
-+    return __high;
-+  }
-+
-+  const char*
-+  ctype<char>::
-+  scan_is(mask __m, const char* __low, const char* __high) const
-+  {
-+    while (__low < __high && !this->is(__m, *__low))
-+      ++__low;
-+    return __low;
-+  }
-+
-+  const char*
-+  ctype<char>::
-+  scan_not(mask __m, const char* __low, const char* __high) const
-+  {
-+    while (__low < __high && this->is(__m, *__low) != 0)
-+      ++__low;
-+    return __low;
-+  }
-+
-+_GLIBCXX_END_NAMESPACE_VERSION
-+} // namespace
-diff -aurN gcc-4.6.3/libstdc++-v3/config/os/mint/ctype_noninline.h gcc-4.6.3-mint-20120503/libstdc++-v3/config/os/mint/ctype_noninline.h
---- gcc-4.6.3/libstdc++-v3/config/os/mint/ctype_noninline.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/libstdc++-v3/config/os/mint/ctype_noninline.h	2012-05-03 18:23:01.046875000 +0200
-@@ -0,0 +1,92 @@
-+// Locale support -*- C++ -*-
-+
-+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2009, 2010
-+//  Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 3, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// Under Section 7 of GPL version 3, you are granted additional
-+// permissions described in the GCC Runtime Library Exception, version
-+// 3.1, as published by the Free Software Foundation.
-+
-+// You should have received a copy of the GNU General Public License and
-+// a copy of the GCC Runtime Library Exception along with this program;
-+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+// <http://www.gnu.org/licenses/>.
-+
-+/** @file bits/ctype_noninline.h
-+ *  This is an internal header file, included by other library headers.
-+ *  Do not attempt to use it directly. @headername{locale}
-+ */
-+
-+//
-+// ISO C++ 14882: 22.1  Locales
-+//
-+  
-+// Information as gleaned from /usr/include/ctype.h
-+
-+  const ctype_base::mask*
-+  ctype<char>::classic_table() throw()
-+  { return 0; }
-+
-+  ctype<char>::ctype(__c_locale, const mask* __table, bool __del, 
-+		     size_t __refs) 
-+  : facet(__refs), _M_del(__table != 0 && __del), 
-+  _M_toupper(NULL), _M_tolower(NULL), 
-+  _M_table(__table ? __table : classic_table()) 
-+  { 
-+    memset(_M_widen, 0, sizeof(_M_widen));
-+    _M_widen_ok = 0;
-+    memset(_M_narrow, 0, sizeof(_M_narrow));
-+    _M_narrow_ok = 0;
-+  }
-+
-+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
-+  : facet(__refs), _M_del(__table != 0 && __del), 
-+  _M_toupper(NULL), _M_tolower(NULL), 
-+  _M_table(__table ? __table : classic_table())
-+  { 
-+    memset(_M_widen, 0, sizeof(_M_widen));
-+    _M_widen_ok = 0;
-+    memset(_M_narrow, 0, sizeof(_M_narrow));
-+    _M_narrow_ok = 0;
-+  }
-+
-+  char
-+  ctype<char>::do_toupper(char __c) const
-+  { return ::toupper((int) __c); }
-+
-+  const char*
-+  ctype<char>::do_toupper(char* __low, const char* __high) const
-+  {
-+    while (__low < __high)
-+      {
-+	*__low = ::toupper((int) *__low);
-+	++__low;
-+      }
-+    return __high;
-+  }
-+
-+  char
-+  ctype<char>::do_tolower(char __c) const
-+  { return ::tolower((int) __c); }
-+
-+  const char* 
-+  ctype<char>::do_tolower(char* __low, const char* __high) const
-+  {
-+    while (__low < __high)
-+      {
-+	*__low = ::tolower((int) *__low);
-+	++__low;
-+      }
-+    return __high;
-+  }
-diff -aurN gcc-4.6.3/libstdc++-v3/config/os/mint/os_defines.h gcc-4.6.3-mint-20120503/libstdc++-v3/config/os/mint/os_defines.h
---- gcc-4.6.3/libstdc++-v3/config/os/mint/os_defines.h	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/libstdc++-v3/config/os/mint/os_defines.h	2012-05-03 18:23:01.046875000 +0200
-@@ -0,0 +1,36 @@
-+// Specific definitions for generic platforms  -*- C++ -*-
-+
-+// Copyright (C) 2000, 2009, 2010 Free Software Foundation, Inc.
-+//
-+// This file is part of the GNU ISO C++ Library.  This library is free
-+// software; you can redistribute it and/or modify it under the
-+// terms of the GNU General Public License as published by the
-+// Free Software Foundation; either version 3, or (at your option)
-+// any later version.
-+
-+// This library is distributed in the hope that it will be useful,
-+// but WITHOUT ANY WARRANTY; without even the implied warranty of
-+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+// GNU General Public License for more details.
-+
-+// Under Section 7 of GPL version 3, you are granted additional
-+// permissions described in the GCC Runtime Library Exception, version
-+// 3.1, as published by the Free Software Foundation.
-+
-+// You should have received a copy of the GNU General Public License and
-+// a copy of the GCC Runtime Library Exception along with this program;
-+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+// <http://www.gnu.org/licenses/>.
-+
-+/** @file bits/os_defines.h
-+ *  This is an internal header file, included by other library headers.
-+ *  Do not attempt to use it directly. @headername{iosfwd}
-+ */
-+
-+#ifndef _GLIBCXX_OS_DEFINES
-+#define _GLIBCXX_OS_DEFINES 1
-+
-+// System-specific #define, typedefs, corrections, etc, go here.  This
-+// file will come before all others.
-+
-+#endif
-diff -aurN gcc-4.6.3/libstdc++-v3/configure gcc-4.6.3-mint-20120503/libstdc++-v3/configure
---- gcc-4.6.3/libstdc++-v3/configure	2011-11-20 22:24:07.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/libstdc++-v3/configure	2012-05-03 18:23:01.125000000 +0200
-@@ -44640,7 +44640,7 @@
- 	;;
-     esac
-     ;;
--  *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
-+  *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu | *-mint*)
- 
-   # All these tests are for C++; save the language and the compiler flags.
-   # The CXXFLAGS thing is suspicious, but based on similar bits previously
-diff -aurN gcc-4.6.3/libstdc++-v3/configure.host gcc-4.6.3-mint-20120503/libstdc++-v3/configure.host
---- gcc-4.6.3/libstdc++-v3/configure.host	2010-12-06 01:50:04.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/libstdc++-v3/configure.host	2012-05-03 18:23:01.125000000 +0200
-@@ -258,6 +258,10 @@
-     error_constants_dir="os/mingw32"
-     OPT_LDFLAGS="${OPT_LDFLAGS} \$(lt_host_flags)"
-     ;;
-+  mint*)
-+    SECTION_FLAGS="${SECTION_FLAGS} -D_GNU_SOURCE"
-+    os_include_dir="os/mint"
-+    ;;
-   netbsd*)
-     os_include_dir="os/bsd/netbsd"
-     ;;
-diff -aurN gcc-4.6.3/libstdc++-v3/crossconfig.m4 gcc-4.6.3-mint-20120503/libstdc++-v3/crossconfig.m4
---- gcc-4.6.3/libstdc++-v3/crossconfig.m4	2011-02-04 08:26:57.000000000 +0100
-+++ gcc-4.6.3-mint-20120503/libstdc++-v3/crossconfig.m4	2012-05-03 18:23:01.125000000 +0200
-@@ -141,7 +141,7 @@
- 	;;
-     esac
-     ;;
--  *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
-+  *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu | *-mint*)
-     GLIBCXX_CHECK_COMPILER_FEATURES
-     GLIBCXX_CHECK_LINKER_FEATURES
-     GLIBCXX_CHECK_MATH_SUPPORT

diff --git a/sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint3.patch b/sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint3.patch
deleted file mode 100644
index 1c8149c98a..0000000000
--- a/sys-devel/gcc/files/4.6.3/gcc-4.6.3-mint3.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=347319
-
---- gcc/Makefile.in.old	2010-11-26 18:16:31.000000000 +0000
-+++ gcc/Makefile.in	2010-11-26 18:17:13.000000000 +0000
-@@ -1819,6 +1819,7 @@
- cc1$(exeext): $(C_OBJS) cc1-checksum.o $(BACKEND) $(LIBDEPS)
- 	$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \
- 	  cc1-checksum.o $(BACKEND) $(LIBS) $(BACKENDLIBS)
-+	stack -S 3 $@
- 
- #
- # Build libgcc.a.

diff --git a/sys-devel/gcc/files/4.6.3/solaris-x86_64.patch b/sys-devel/gcc/files/4.6.3/solaris-x86_64.patch
deleted file mode 100644
index a7859f3f0a..0000000000
--- a/sys-devel/gcc/files/4.6.3/solaris-x86_64.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-Sort of backport of
-http://gcc.gnu.org/ml/gcc-patches/2011-07/msg00327.html
-
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -1364,7 +1364,7 @@
- 	extra_parts="crtbegin.o crtend.o crti.o crtn.o"
- 	tmake_file="${tmake_file} i386/t-rtems-i386 i386/t-crtstuff t-rtems"
- 	;;
--i[34567]86-*-solaris2*)
-+i[34567]86-*-solaris2*|x86_64-*-solaris2*)
- 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/sysv4.h sol2.h"
- 	# Set default arch_32 to pentium4, tune_32 to generic like the other
- 	# i386 targets, although config.guess defaults to i386-pc-solaris2*.
-@@ -1409,6 +1409,11 @@
- 	case ${target} in
- 	*-*-solaris2.1[0-9]*)
- 		tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h"
-+		case ${target} in
-+		x86_64-*)
-+			tm_file="${tm_file} i386/sol2-64.h"
-+		;;
-+		esac
- 		tm_defines="${tm_defines} TARGET_BI_ARCH=1"
- 		tmake_file="$tmake_file i386/t-sol2-10"
- 		# i386/t-crtstuff only affects libgcc.  Its inclusion
-@@ -3670,7 +3670,7 @@
- 	  i[34567]86-*-gnu*)
- 		tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp i386/t-linux"
- 		;;
--	i[34567]86-*-solaris2*)
-+	i[34567]86-*-solaris2*|x86_64-*-solaris2*)
- 		tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp"
- 		;;
- 	i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
---- a/gcc/config.host
-+++ b/gcc/config.host
-@@ -197,7 +197,7 @@
-   i370-*-opened* | i370-*-mvs* ) # IBM 360/370/390 Architecture
-     host_xm_defines='FATAL_EXIT_CODE=12'
-     ;;
--  i[34567]86-*-solaris2*)
-+  i[34567]86-*-solaris2*|x86_64-*-solaris2*)
-     out_host_hook_obj=host-solaris.o
-     host_xmake_file="${host_xmake_file} x-solaris"
-     ;;
---- a/gcc/config/host-solaris.c
-+++ b/gcc/config/host-solaris.c
-@@ -73,7 +73,7 @@
- #elif defined(__sparc__)
- # define TRY_EMPTY_VM_SPACE	0x80000000
- #elif defined(__x86_64__)
--# define TRY_EMPTY_VM_SPACE	0x8000000000000000
-+# define TRY_EMPTY_VM_SPACE	0x80000000000
- #elif defined(__i386__)
- # define TRY_EMPTY_VM_SPACE	0xB0000000
- #else
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -2136,7 +2136,7 @@
- # Solaris 9/x86 as incorrectly emits an alias for a hidden symbol with
- # STV_HIDDEN, so disable .hidden support if so.
- case "${target}" in
--  i?86-*-solaris2*)
-+  i?86-*-solaris2*|x86_64-*-solaris2*)
-     if test x$gcc_cv_as != x && test x$gcc_cv_objdump != x; then
-       cat > conftest.s <<EOF
- .globl hidden
-@@ -2367,7 +2367,7 @@
- 	  gcc_cv_as_cfi_directive=no
- 	else
- 	  case "$target" in
--	    i?86-*-solaris2.1[[0-9]]*)
-+	    i?86-*-solaris2.1[[0-9]]*|x86_64-*-solaris2*)
- 	      # On Solaris/x86, make sure that GCC and gas agree on using
- 	      # read-only .eh_frame sections for 64-bit.
- 	      if $gcc_cv_as --64 -o conftest.o conftest.s > /dev/null 2>&1 && \
-@@ -2716,6 +2716,10 @@
- 	on_solaris=yes
- 	tga_func=___tls_get_addr
- 	;;
-+      x86_64-*-solaris2*)
-+	on_solaris=yes
-+	tga_func=__tls_get_addr
-+	;;
-       *)
- 	on_solaris=no
- 	;;
---- a/gcc/config/i386/sol2-64.h
-+++ b/gcc/config/i386/sol2-64.h
-@@ -0,0 +1,5 @@
-+/* Definitions of target machine for GCC, for bi-arch i386
-+   running Solaris 2, defaulting to 64-bit code generation.  */
-+
-+#undef MULTILIB_DEFAULTS
-+#define MULTILIB_DEFAULTS { "m64" }
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -21651,7 +21651,7 @@
- # Solaris 9/x86 as incorrectly emits an alias for a hidden symbol with
- # STV_HIDDEN, so disable .hidden support if so.
- case "${target}" in
--  i?86-*-solaris2*)
-+  i?86-*-solaris2*|x86_64-*-solaris2*)
-     if test x$gcc_cv_as != x && test x$gcc_cv_objdump != x; then
-       cat > conftest.s <<EOF
- .globl hidden
-@@ -21942,7 +21942,7 @@
- 	  gcc_cv_as_cfi_directive=no
- 	else
- 	  case "$target" in
--	    i?86-*-solaris2.1[0-9]*)
-+	    i?86-*-solaris2.1[0-9]*|x86_64-*-solaris2*)
- 	      # On Solaris/x86, make sure that GCC and gas agree on using
- 	      # read-only .eh_frame sections for 64-bit.
- 	      if $gcc_cv_as --64 -o conftest.o conftest.s > /dev/null 2>&1 && \
-@@ -22549,6 +22549,10 @@
- 	on_solaris=yes
- 	tga_func=___tls_get_addr
- 	;;
-+      x86_64-*-solaris2*)
-+	on_solaris=yes
-+	tga_func=__tls_get_addr
-+	;;
-       *)
- 	on_solaris=no
- 	;;
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -316,7 +316,7 @@
- 	;;
- i[34567]86-*-rtems*)
- 	;;
--i[34567]86-*-solaris2*)
-+i[34567]86-*-solaris2*|x86_64-*-solaris2*)
- 	tmake_file="${tmake_file} i386/t-sol2"
- 	case ${host} in
- 	*-*-solaris2.1[0-9]*)
---- a/libgcc/configure.ac
-+++ b/libgcc/configure.ac
-@@ -176,7 +176,7 @@
- # Link with -nostartfiles -nodefaultlibs since neither are present while
- # building libgcc.
- case ${host} in
--i?86-*-solaris2*)
-+i?86-*-solaris2*|x86_64-*-solaris2*)
-   cat > conftest.s <<EOF
- 	.section	.eh_frame,"a",@unwind
- 	.zero	4
---- a/libgcc/configure
-+++ b/libgcc/configure
-@@ -3425,7 +3425,7 @@
- # Link with -nostartfiles -nodefaultlibs since neither are present while
- # building libgcc.
- case ${host} in
--i?86-*-solaris2*)
-+i?86-*-solaris2*|x86_64-*-solaris2*)
-   cat > conftest.s <<EOF
- 	.section	.eh_frame,"a",@unwind
- 	.zero	4
---- a/libcpp/configure.ac
-+++ b/libcpp/configure.ac
-@@ -145,7 +145,7 @@
- 	ia64-*-* | \
- 	hppa*64*-*-* | \
- 	i[34567]86-*-darwin* | \
--	i[34567]86-*-solaris2.1[0-9]* | \
-+	i[34567]86-*-solaris2.1[0-9]* | x86_64-*-solaris2.1[0-9]* | \
- 	i[34567]86-w64-mingw* | \
- 	mips*-*-* | \
- 	mmix-*-* | \
---- a/libcpp/configure
-+++ b/libcpp/configure
-@@ -7095,7 +7095,7 @@
- 	ia64-*-* | \
- 	hppa*64*-*-* | \
- 	i[34567]86-*-darwin* | \
--	i[34567]86-*-solaris2.1[0-9]* | \
-+	i[34567]86-*-solaris2.1[0-9]* | x86_64-*-solaris2.1[0-9]* | \
- 	i[34567]86-w64-mingw* | \
- 	mips*-*-* | \
- 	mmix-*-* | \
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -612,7 +612,7 @@
-   i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu | \
-   i[34567]86-*-linux* | x86_64-*-linux* | \
-   i[34567]86-*-gnu* | \
--  i[34567]86-*-solaris2* | \
-+  i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]* | \
-   i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw* | \
-   i[34567]86-*-freebsd* | x86_64-*-freebsd*)
- 	if test "${host_address}" = 32; then
---- a/configure.ac
-+++ b/configure.ac
-@@ -870,7 +870,7 @@
-   i[[3456789]]86-*-sco*)
-     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
-     ;;
--  i[[3456789]]86-*-solaris2*)
-+  i[[3456789]]86-*-solaris2* | x86_64-*-solaris2.1?)
-     noconfigdirs="$noconfigdirs target-libgloss"
-     ;;
-   i[[3456789]]86-*-sysv4*)
---- a/configure
-+++ b/configure
-@@ -3449,7 +3449,7 @@
-   i[3456789]86-*-sco*)
-     noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}"
-     ;;
--  i[3456789]86-*-solaris2*)
-+  i[3456789]86-*-solaris2* | x86_64-*-solaris2.1?)
-     noconfigdirs="$noconfigdirs target-libgloss"
-     ;;
-   i[3456789]86-*-sysv4*)

diff --git a/sys-devel/gcc/files/awk/fixlafiles.awk b/sys-devel/gcc/files/awk/fixlafiles.awk
deleted file mode 100644
index a49af35515..0000000000
--- a/sys-devel/gcc/files/awk/fixlafiles.awk
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/awk/fixlafiles.awk,v 1.15 2008/02/19 05:47:29 vapier Exp $
-
-#
-# Helper functions
-#
-function printn(string) {
-	printf("%s", string)
-}
-function einfo(string) {
-	printf(" \033[32;01m*\033[0m %s\n", string)
-}
-function einfon(string) {
-	printf(" \033[32;01m*\033[0m %s", string)
-}
-function ewarn(string) {
-	printf(" \033[33;01m*\033[0m %s\n", string)
-}
-function ewarnn(string) {
-	printf(" \033[33;01m*\033[0m %s", string)
-}
-function eerror(string) {
-	printf(" \033[31;01m*\033[0m %s\n", string)
-}
-
-#
-# assert(condition, errmsg)
-#   assert that a condition is true.  Otherwise exit.
-#
-function assert(condition, string) {
-	if (! condition) {
-		printf("%s:%d: assertion failed: %s\n",
-		       FILENAME, FNR, string) > "/dev/stderr"
-		_assert_exit = 1
-		exit 1
-	}
-}
-
-#
-# system(command, return)
-#   wrapper that normalizes return codes ...
-#
-function dosystem(command, ret) {
-	ret = 0
-	ret = system(command)
-	if (ret == 0)
-		return 1
-	else
-		return 0
-}
-
-BEGIN {
-	#
-	# Get our variables from environment
-	#
-	OLDVER = ENVIRON["OLDVER"]
-	OLDCHOST = ENVIRON["OLDCHOST"]
-
-	if (OLDVER == "") {
-		eerror("Could not get OLDVER!");
-		exit 1
-	}
-
-	# Setup some sane defaults
-	LIBCOUNT = 2
-	HAVE_GCC34 = 0
-	DIRLIST[1] = "@GENTOO_PORTAGE_EPREFIX@/lib"
-	DIRLIST[2] = "@GENTOO_PORTAGE_EPREFIX@/usr/lib"
-
-	#
-	# Walk /etc/ld.so.conf to discover all our library paths
-	#
-	pipe = "cat @GENTOO_PORTAGE_EPREFIX@/etc/ld.so.conf | sort 2>/dev/null"
-	while(((pipe) | getline ldsoconf_data) > 0) {
-		if (ldsoconf_data !~ /^[[:space:]]*#/) {
-			if (ldsoconf_data == "") continue
-
-			# Remove any trailing comments
-			sub(/#.*$/, "", ldsoconf_data)
-			# Remove any trailing spaces
-			sub(/[[:space:]]+$/, "", ldsoconf_data)
-
-			# If there's more than one path per line, split 
-			# it up as if they were sep lines
-			split(ldsoconf_data, nodes, /[:,[:space:]]/)
-
-			# Now add the rest from ld.so.conf
-			for (x in nodes) {
-				# wtf does this line do ?
-				sub(/=.*/, "", nodes[x])
-				# Prune trailing /
-				sub(/\/$/, "", nodes[x])
-
-				if (nodes[x] == "") continue
-
-				#
-				# Drop the directory if its a child directory of
-				# one that was already added ...
-				# For example, if we have:
-				#   /usr/lib /usr/libexec /usr/lib/mozilla /usr/lib/nss
-				# We really just want to save /usr/lib /usr/libexec
-				#
-				CHILD = 0
-				for (y in DIRLIST) {
-					if (nodes[x] ~ "^" DIRLIST[y] "(/|$)") {
-						CHILD = 1
-						break
-					}
-				}
-				if (CHILD) continue
-
-				DIRLIST[++LIBCOUNT] = nodes[x]
-			}
-		}
-	}
-	close(pipe)
-
-	#
-	# Get line from gcc's output containing CHOST
-	#
-	pipe = "gcc -print-file-name=libgcc.a 2>/dev/null"
-	if ((!((pipe) | getline TMP_CHOST)) || (TMP_CHOST == "")) {
-		close(pipe)
-
-		# If we fail to get the CHOST, see if we can get the CHOST
-		# portage thinks we are using ...
-		pipe = "@GENTOO_PORTAGE_EPREFIX@/usr/bin/portageq envvar 'CHOST'"
-		assert(((pipe) | getline CHOST), "(" pipe ") | getline CHOST")
-	} else {
-		# Check pre gcc-3.4.x versions
-		CHOST = gensub("^.+lib/gcc-lib/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST)
-
-		if (CHOST == TMP_CHOST || CHOST == "") {
-			# Check gcc-3.4.x or later
-			CHOST = gensub("^.+lib/gcc/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST);
-
-			if (CHOST == TMP_CHOST || CHOST == "")
-				CHOST = ""
-			else
-				HAVE_GCC34 = 1
-		}
-	}
-	close(pipe)
-
-	if (CHOST == "") {
-		eerror("Could not get gcc's CHOST!")
-		exit 1
-	}
-
-	if (OLDCHOST != "")
-		if (OLDCHOST == CHOST)
-			OLDCHOST = ""
-
-	GCCLIBPREFIX_OLD = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc-lib/"
-	GCCLIBPREFIX_NEW = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/"
-
-	if (HAVE_GCC34)
-		GCCLIBPREFIX = GCCLIBPREFIX_NEW
-	else
-		GCCLIBPREFIX = GCCLIBPREFIX_OLD
-
-	GCCLIB = GCCLIBPREFIX CHOST
-
-	if (OLDCHOST != "") {
-		OLDGCCLIB1 = GCCLIBPREFIX_OLD OLDCHOST
-		OLDGCCLIB2 = GCCLIBPREFIX_NEW OLDCHOST
-	}
-
-	# Get current gcc's version
-	pipe = "gcc -dumpversion"
-	assert(((pipe) | getline NEWVER), "(" pipe ") | getline NEWVER)")
-	close(pipe)
-
-	if (NEWVER == "") {
-		eerror("Could not get gcc's version!")
-		exit 1
-	}
-
-	# Nothing to do ?
-	if ((OLDVER == NEWVER) && (OLDCHOST == ""))
-		exit 0
-
-	#
-	# Ok, now let's scan for the .la files and actually fix them up
-	#
-	for (x = 1; x <= LIBCOUNT; x++) {
-		# Do nothing if the target dir is gcc's internal library path
-		if (DIRLIST[x] ~ GCCLIBPREFIX_OLD ||
-		    DIRLIST[x] ~ GCCLIBPREFIX_NEW)
-			continue
-
-		einfo("  [" x "/" LIBCOUNT "] Scanning " DIRLIST[x] " ...")
-
-		pipe = "find " DIRLIST[x] "/ -name '*.la' 2>/dev/null"
-		while (((pipe) | getline la_files) > 0) {
-
-			# Do nothing if the .la file is located in gcc's internal lib path
-			if (la_files ~ GCCLIBPREFIX_OLD ||
-			    la_files ~ GCCLIBPREFIX_NEW)
-				continue
-
-			CHANGED = 0
-			CHOST_CHANGED = 0
-
-			# See if we need to fix the .la file
-			while ((getline la_data < (la_files)) > 0) {
-				if (OLDCHOST != "") {
-					if ((gsub(OLDGCCLIB1 "[/[:space:]]+",
-					          GCCLIB, la_data) > 0) ||
-					    (gsub(OLDGCCLIB2 "[/[:space:]]+",
-					          GCCLIB, la_data) > 0)) {
-						CHANGED = 1
-						CHOST_CHANGED = 1
-					}
-				}
-				if (OLDVER != NEWVER) {
-					if ((gsub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "[/[:space:]]*",
-					          GCCLIB "/" NEWVER, la_data) > 0) ||
-					    (gsub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "[/[:space:]]*",
-					          GCCLIB "/" NEWVER, la_data) > 0))
-						CHANGED = 1
-				}
-			}
-			close(la_files)
-
-			# Do the actual changes in a second loop, as we can then
-			# verify that CHOST_CHANGED among things is correct ...
-			if (CHANGED) {
-				ewarnn("    FIXING: " la_files " ...")
-
-				if (CHANGED)
-					printn("[")
-
-				# Clear the temp file (removing rather than '>foo' is better
-				# out of a security point of view?)
-				dosystem("rm -f " la_files ".new")
-
-				while ((getline la_data < (la_files)) > 0) {
-					if (OLDCHOST != "") {
-						tmpstr = gensub(OLDGCCLIB1 "([/[:space:]]+)",
-						                GCCLIB "\\1", "g", la_data)
-						tmpstr = gensub(OLDGCCLIB2 "([/[:space:]]+)",
-						                GCCLIB "\\1", "g", tmpstr)
-
-						if (la_data != tmpstr) {
-							printn("c")
-							la_data = tmpstr
-						}
-
-						if (CHOST_CHANGED > 0) {
-							# We try to be careful about CHOST changes outside
-							# the gcc library path (meaning we cannot match it
-							# via /GCCLIBPREFIX CHOST/) ...
-
-							# Catch:
-							#
-							#  dependency_libs=' -L/usr/CHOST/{bin,lib}'
-							#
-							gsub("-L@GENTOO_PORTAGE_EPREFIX@/usr/" OLDCHOST "/",
-							     "-L@GENTOO_PORTAGE_EPREFIX@/usr/" CHOST "/", la_data)
-							# Catch:
-							#
-							#  dependency_libs=' -L/usr/lib/gcc-lib/CHOST/VER/../../../../CHOST/lib'
-							#
-							la_data = gensub("(" GCCLIB "/[^[:space:]]+)/" OLDCHOST "/",
-							                 "\\1/" CHOST "/", "g", la_data)
-						}
-					}
-
-					if (OLDVER != NEWVER) {
-						# Catch:
-						#
-						#  dependency_libs=' -L/usr/lib/gcc/CHOST/VER'
-						#
-						tmpstr = gensub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "([/[:space:]]+)",
-						                GCCLIB "/" NEWVER "\\1", "g", la_data)
-						tmpstr = gensub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "([/[:space:]]+)",
-						                GCCLIB "/" NEWVER "\\1", "g", tmpstr)
-
-						if (la_data != tmpstr) {
-							# Catch:
-							#
-							#  dependency_libs=' -L/usr/lib/gcc-lib/../../CHOST/lib'
-							#
-							# in cases where we have gcc34
-							tmpstr = gensub(GCCLIBPREFIX_OLD "(../../" CHOST "/lib)",
-							                GCCLIBPREFIX "\\1", "g", tmpstr)
-							tmpstr = gensub(GCCLIBPREFIX_NEW "(../../" CHOST "/lib)",
-							                GCCLIBPREFIX "\\1", "g", tmpstr)
-							printn("v")
-							la_data = tmpstr
-						}
-					}
-
-					print la_data >> (la_files ".new")
-				}
-
-				if (CHANGED)
-					print "]"
-
-				close(la_files)
-				close(la_files ".new")
-
-				assert(dosystem("mv -f " la_files ".new " la_files),
-				       "dosystem(\"mv -f " la_files ".new " la_files "\")")
-			}
-		}
-
-		close(pipe)
-	}
-}
-
-# vim:ts=4

diff --git a/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la b/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la
deleted file mode 100644
index 0c95253523..0000000000
--- a/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la,v 1.4 2010/03/19 23:53:07 vapier Exp $
-
-#
-# Helper functions
-#
-function printn(string) {
-	printf("%s", string)
-}
-function einfo(string) {
-	printf(" \033[32;01m*\033[0m %s\n", string)
-}
-function einfon(string) {
-	printf(" \033[32;01m*\033[0m %s", string)
-}
-function ewarn(string) {
-	printf(" \033[33;01m*\033[0m %s\n", string)
-}
-function ewarnn(string) {
-	printf(" \033[33;01m*\033[0m %s", string)
-}
-function eerror(string) {
-	printf(" \033[31;01m*\033[0m %s\n", string)
-}
-
-#
-# assert(condition, errmsg)
-#   assert that a condition is true.  Otherwise exit.
-#
-function assert(condition, string) {
-	if (! condition) {
-		printf("%s:%d: assertion failed: %s\n",
-		       FILENAME, FNR, string) > "/dev/stderr"
-		_assert_exit = 1
-		exit 1
-	}
-}
-
-#
-# system(command, return)
-#   wrapper that normalizes return codes ...
-#
-function dosystem(command, ret) {
-	ret = 0
-	ret = system(command)
-	if (ret == 0)
-		return 1
-	else
-		return 0
-}
-
-#
-# parse_ld_conf(config_file)
-#
-function parse_ld_conf(conf,    pipe, ldsoconf_data, CHILD, y) {
-	pipe = "cd @GENTOO_PORTAGE_EPREFIX@/etc; cat " conf " | sort 2>/dev/null"
-	while(((pipe) | getline ldsoconf_data) > 0) {
-		if (ldsoconf_data ~ /^[[:space:]]*#/)
-			continue
-		if (ldsoconf_data == "")
-			continue
-
-		# Handle the "include" keyword
-		if (ldsoconf_data ~ /^include /) {
-			sub(/^include /, "", ldsoconf_data)
-			parse_ld_conf(ldsoconf_data)
-			continue
-		}
-
-		# Remove any trailing comments
-		sub(/#.*$/, "", ldsoconf_data)
-		# Remove any trailing spaces
-		sub(/[[:space:]]+$/, "", ldsoconf_data)
-		# Eat duplicate slashes
-		sub(/\/\//, "/", ldsoconf_data)
-		# Prune trailing /
-		sub(/\/$/, "", ldsoconf_data)
-
-		#
-		# Drop the directory if its a child directory of
-		# one that was already added ...
-		# For example, if we have:
-		#   /usr/lib /usr/libexec /usr/lib/mozilla /usr/lib/nss
-		# We really just want to save /usr/lib /usr/libexec
-		#
-		CHILD = 0
-		for (y in DIRLIST) {
-			if (ldsoconf_data ~ "^" DIRLIST[y] "(/|$)") {
-				CHILD = 1
-				break
-			}
-		}
-		if (CHILD) continue
-
-		DIRLIST[++LIBCOUNT] = ldsoconf_data
-	}
-	close(pipe)
-}
-
-BEGIN {
-	#
-	# Get our variables from environment
-	#
-	OLDVER = ENVIRON["OLDVER"]
-	OLDCHOST = ENVIRON["OLDCHOST"]
-
-	if (OLDVER == "") {
-		eerror("Could not get OLDVER!");
-		exit 1
-	}
-
-	# Setup some sane defaults
-	LIBCOUNT = 2
-	HAVE_GCC34 = 0
-	DIRLIST[1] = "@GENTOO_PORTAGE_EPREFIX@/lib"
-	DIRLIST[2] = "@GENTOO_PORTAGE_EPREFIX@/usr/lib"
-
-	#
-	# Walk /etc/ld.so.conf to discover all our library paths
-	#
-	parse_ld_conf("@GENTOO_PORTAGE_EPREFIX@/etc/ld.so.conf")
-
-	#
-	# Get line from gcc's output containing CHOST
-	#
-	pipe = "gcc -print-file-name=libgcc.a 2>/dev/null"
-	if ((!((pipe) | getline TMP_CHOST)) || (TMP_CHOST == "")) {
-		close(pipe)
-
-		# If we fail to get the CHOST, see if we can get the CHOST
-		# portage thinks we are using ...
-		pipe = "@GENTOO_PORTAGE_EPREFIX@/usr/bin/portageq envvar 'CHOST'"
-		assert(((pipe) | getline CHOST), "(" pipe ") | getline CHOST")
-	} else {
-		# Check pre gcc-3.4.x versions
-		CHOST = gensub("^.+lib/gcc-lib/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST)
-
-		if (CHOST == TMP_CHOST || CHOST == "") {
-			# Check gcc-3.4.x or later
-			CHOST = gensub("^.+lib/gcc/([^/]+)/[0-9]+.+$", "\\1", 1, TMP_CHOST);
-
-			if (CHOST == TMP_CHOST || CHOST == "")
-				CHOST = ""
-			else
-				HAVE_GCC34 = 1
-		}
-	}
-	close(pipe)
-
-	if (CHOST == "") {
-		eerror("Could not get gcc's CHOST!")
-		exit 1
-	}
-
-	if (OLDCHOST != "")
-		if (OLDCHOST == CHOST)
-			OLDCHOST = ""
-
-	GCCLIBPREFIX_OLD = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc-lib/"
-	GCCLIBPREFIX_NEW = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/"
-
-	if (HAVE_GCC34)
-		GCCLIBPREFIX = GCCLIBPREFIX_NEW
-	else
-		GCCLIBPREFIX = GCCLIBPREFIX_OLD
-
-	GCCLIB = GCCLIBPREFIX CHOST
-
-	if (OLDCHOST != "") {
-		OLDGCCLIB1 = GCCLIBPREFIX_OLD OLDCHOST
-		OLDGCCLIB2 = GCCLIBPREFIX_NEW OLDCHOST
-	}
-
-	# Get current gcc's version
-	pipe = "gcc -dumpversion"
-	assert(((pipe) | getline NEWVER), "(" pipe ") | getline NEWVER)")
-	close(pipe)
-
-	if (NEWVER == "") {
-		eerror("Could not get gcc's version!")
-		exit 1
-	}
-
-	# Nothing to do ?
-	# NB: Do not check for (OLDVER == NEWVER) anymore, as we might need to
-	#     replace libstdc++.la ....
-	if ((OLDVER == "") && (OLDCHOST == ""))
-		exit 0
-
-	#
-	# Ok, now let's scan for the .la files and actually fix them up
-	#
-	for (x = 1; x <= LIBCOUNT; x++) {
-		# Do nothing if the target dir is gcc's internal library path
-		if (DIRLIST[x] ~ GCCLIBPREFIX_OLD ||
-		    DIRLIST[x] ~ GCCLIBPREFIX_NEW)
-			continue
-
-		einfo("  [" x "/" LIBCOUNT "] Scanning " DIRLIST[x] " ...")
-
-		pipe = "find " DIRLIST[x] "/ -name '*.la' 2>/dev/null"
-		while (((pipe) | getline la_files) > 0) {
-
-			# Do nothing if the .la file is located in gcc's internal lib path
-			if (la_files ~ GCCLIBPREFIX_OLD ||
-			    la_files ~ GCCLIBPREFIX_NEW)
-				continue
-
-			CHANGED = 0
-			CHOST_CHANGED = 0
-
-			# See if we need to fix the .la file
-			while ((getline la_data < (la_files)) > 0) {
-				if (OLDCHOST != "") {
-					if ((gsub(OLDGCCLIB1 "[/[:space:]]+",
-					          GCCLIB, la_data) > 0) ||
-					    (gsub(OLDGCCLIB2 "[/[:space:]]+",
-					          GCCLIB, la_data) > 0)) {
-						CHANGED = 1
-						CHOST_CHANGED = 1
-					}
-				}
-				if (OLDVER != NEWVER) {
-					if ((gsub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "[/[:space:]]*",
-					          GCCLIB "/" NEWVER, la_data) > 0) ||
-					    (gsub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "[/[:space:]]*",
-					          GCCLIB "/" NEWVER, la_data) > 0))
-						CHANGED = 1
-				}
-				# We now check if we have libstdc++.la, as we remove the
-				# libtool linker scripts for gcc ...
-				# We do this last, as we only match the new paths
-				if (gsub(GCCLIB "/" NEWVER "/libstdc\\+\\+\\.la",
-				         "-lstdc++", la_data) > 0)
-					CHANGED = 1
-			}
-			close(la_files)
-
-			# Do the actual changes in a second loop, as we can then
-			# verify that CHOST_CHANGED among things is correct ...
-			if (CHANGED) {
-				ewarnn("    FIXING: " la_files " ...[")
-
-				# Clear the temp file (removing rather than '>foo' is better
-				# out of a security point of view?)
-				dosystem("rm -f " la_files ".new")
-
-				while ((getline la_data < (la_files)) > 0) {
-					if (OLDCHOST != "") {
-						tmpstr = gensub(OLDGCCLIB1 "([/[:space:]]+)",
-						                GCCLIB "\\1", "g", la_data)
-						tmpstr = gensub(OLDGCCLIB2 "([/[:space:]]+)",
-						                GCCLIB "\\1", "g", tmpstr)
-
-						if (la_data != tmpstr) {
-							printn("c")
-							la_data = tmpstr
-						}
-
-						if (CHOST_CHANGED > 0) {
-							# We try to be careful about CHOST changes outside
-							# the gcc library path (meaning we cannot match it
-							# via /GCCLIBPREFIX CHOST/) ...
-
-							# Catch:
-							#
-							#  dependency_libs=' -L/usr/CHOST/{bin,lib}'
-							#
-							gsub("-L@GENTOO_PORTAGE_EPREFIX@/usr/" OLDCHOST "/",
-							     "-L@GENTOO_PORTAGE_EPREFIX@/usr/" CHOST "/", la_data)
-							# Catch:
-							#
-							#  dependency_libs=' -L/usr/lib/gcc-lib/CHOST/VER/../../../../CHOST/lib'
-							#
-							la_data = gensub("(" GCCLIB "/[^[:space:]]+)/" OLDCHOST "/",
-							                 "\\1/" CHOST "/", "g", la_data)
-						}
-					}
-
-					if (OLDVER != NEWVER) {
-						# Catch:
-						#
-						#  dependency_libs=' -L/usr/lib/gcc/CHOST/VER'
-						#
-						tmpstr = gensub(GCCLIBPREFIX_OLD CHOST "/" OLDVER "([/[:space:]]+)",
-						                GCCLIB "/" NEWVER "\\1", "g", la_data)
-						tmpstr = gensub(GCCLIBPREFIX_NEW CHOST "/" OLDVER "([/[:space:]]+)",
-						                GCCLIB "/" NEWVER "\\1", "g", tmpstr)
-
-						if (la_data != tmpstr) {
-							# Catch:
-							#
-							#  dependency_libs=' -L/usr/lib/gcc-lib/../../CHOST/lib'
-							#
-							# in cases where we have gcc34
-							tmpstr = gensub(GCCLIBPREFIX_OLD "(../../" CHOST "/lib)",
-							                GCCLIBPREFIX "\\1", "g", tmpstr)
-							tmpstr = gensub(GCCLIBPREFIX_NEW "(../../" CHOST "/lib)",
-							                GCCLIBPREFIX "\\1", "g", tmpstr)
-							printn("v")
-							la_data = tmpstr
-						}
-					}
-
-					# We now check if we have libstdc++.la, as we remove the
-					# libtool linker scripts for gcc and any referencese in any
-					# libtool linker scripts.
-					# We do this last, as we only match the new paths
-					tmpstr = gensub(GCCLIB "/" NEWVER "/libstdc\\+\\+\\.la",
-					                "-lstdc++", "g", la_data);
-					if (la_data != tmpstr) {
-						printn("l")
-						la_data = tmpstr
-					}
-					
-					print la_data >> (la_files ".new")
-				}
-
-				if (CHANGED)
-					print "]"
-
-				close(la_files)
-				close(la_files ".new")
-
-				assert(dosystem("mv -f " la_files ".new " la_files),
-				       "dosystem(\"mv -f " la_files ".new " la_files "\")")
-			}
-		}
-
-		close(pipe)
-	}
-}
-
-# vim:ts=4

diff --git a/sys-devel/gcc/files/awk/scanforssp.awk b/sys-devel/gcc/files/awk/scanforssp.awk
deleted file mode 100644
index e8a1fe8fc8..0000000000
--- a/sys-devel/gcc/files/awk/scanforssp.awk
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Author:  Martin Schlemmer <azarah@g.o>
-# Contributor: Ned Ludd <solar@g.o>
-# Contributor: Natanael Copa  <nat@×××.net>
-# Contributor: Carter Smithhart <derheld42@×××××××.net>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/awk/scanforssp.awk,v 1.7 2004/07/15 00:59:02 agriffis Exp $
-
-
-# Does not seem to be used in this script.
-function printn(string)
-{
-	printf("%s", string)
-}
-
-function einfo(string)
-{
-	printf(" %s %s%s", "\033[32;01m*\033[0m", string, "\n")
-}
-
-# Does not seem to be used in this script.
-function einfon(string)
-{
-	printf(" %s %s" , "\033[32;01m*\033[0m", string)
-}
-
-function ewarn(string)
-{
-	printf(" %s %s%s" , "\033[33;01m*\033[0m", string, "\n")
-}
-
-# Does not seem to be used in this script.
-function ewarnn(string)
-{
-	printf("%s %s" , "\032[33;01m*\033[0m", string)
-}
-
-function eerror(string)
-{
-	printf(" %s %s%s" , "\033[31;01m*\033[0m", string, "\n")
-}
-
-								# These are private, else wierd things
-								# might happen ...
-function iself(scan_files,		scan_file_pipe, scan_data) {
-	# Can we open() a file and read() 4 bytes?
-	scan_file_pipe = ("head -c 4 " scan_files " 2>/dev/null | tail -c 3")
-	scan_file_pipe | getline scan_data
-	close(scan_file_pipe)
-	return ((scan_data == "ELF") ? 0 : 1)
-}
-
-BEGIN {
-	# Do we have etcat ?
-	pipe = ("which etcat 2>/dev/null")
-	if ((((pipe) | getline etcat_data) > 0) && (etcat_data != ""))
-		auto_etcat = 1
-	else
-		auto_etcat = 0
-
-	# Fix bug that causes script to fail when pipe is not closed. Closes bug #36792
-	close(pipe)
-
-	DIRCOUNT = 0
-	# Add the two default library paths
-	DIRLIST[1] = "/lib"
-	DIRLIST[2] = "/usr/lib"
-
-	# Walk /etc/ld.so.conf line for line and get any library paths
-	pipe = ("cat /etc/ld.so.conf 2>/dev/null | sort")
-	while(((pipe) | getline ldsoconf_data) > 0) {
-
-		if (ldsoconf_data !~ /^[[:space:]]*#/) {
-
-			if (ldsoconf_data == "") continue
-
-			# Remove any trailing comments
-			sub(/#.*$/, "", ldsoconf_data)
-			# Remove any trailing spaces
-			sub(/[[:space:]]+$/, "", ldsoconf_data)
-	
-			split(ldsoconf_data, nodes, /[:,[:space:]]/)
-
-			# Now add the rest from ld.so.conf
-			for (x in nodes) {
-
-				sub(/=.*/, "", nodes[x])
-				sub(/\/$/, "", nodes[x])
-
-				if (nodes[x] == "") continue
-
-				CHILD = 0
-
-				# Drop the directory if its a child directory of
-				# one that was already added ...
-				for (y in DIRLIST) {
-
-					if (nodes[x] ~ "^" DIRLIST[y]) {
-					
-						CHILD = 1
-						break
-					}
-				}
-
-				if (CHILD) continue
-		
-				DIRLIST[++DIRCOUNT + 2] = nodes[x]
-			}
-		}
-	}
-
-# We have no guarantee that ld.so.conf have more library paths than
-# the default, and its better scan files only in /lib and /usr/lib
-# than nothing at all ...
-#
-#	exit_val = close(pipe)
-#	if (exit_val != 0)
-#	print(exit_val " - " ERRNO)
-#
-#	if (DIRCOUNT == 0) {
-#		eerror("Could not read from /etc/ld.so.conf!")
-#		exit 1
-#	}
-
-	# Correct DIRCOUNT, as we already added /lib and /usr/lib
-	DIRCOUNT += 2
-
-	# Add all the dirs in $PATH
-	split(ENVIRON["PATH"], TMPPATHLIST, ":")
-	count = asort(TMPPATHLIST, PATHLIST)
-	for (x = 1;x <= count;x++) {
-
-		ADDED = 0
-
-		# Already added?
-		for (dnode in DIRLIST)
-			if (PATHLIST[x] == DIRLIST[dnode])
-				ADDED = 1
-
-		if (ADDED)
-			continue
-
-		# Valid?  If so, add it ...
-		if (((PATHLIST[x] != "") && (PATHLIST[x] != "/") && (PATHLIST[x] != ".")))
-			DIRLIST[++DIRCOUNT] = PATHLIST[x]
-		
-	}
-	
-	GCCLIBPREFIX = "/usr/lib/gcc-lib/"
-	
-	for (x = 1;x <= DIRCOUNT;x++) {
-
-		# Do nothing if the target dir is gcc's internal library path
-		if (DIRLIST[x] ~ GCCLIBPREFIX) continue
-
-		einfo(" Scanning " ((x <= 9) ? "0"x : x)" of " DIRCOUNT " " DIRLIST[x] "...")
-		
-		pipe = ("find " DIRLIST[x] "/ -type f -perm -1 2>/dev/null")
-		while ( (pipe | getline scan_files) > 0) {
-
-                    #print scan_files
-			# Do nothing if the file is located in gcc's internal lib path ...
-			if (scan_files ~ GCCLIBPREFIX) continue
-			# Or if its hardend files ...
-			if (scan_files ~ "/lib/libgcc-3" ) continue
-			# Or not a elf image ...
-			if (iself(scan_files)) continue
-
-                        scan_file_pipe = ("readelf -s " scan_files " 2>&1")
-			while (((scan_file_pipe) | getline scan_data) > 0) {
-                            bad = 0;
-				if (scan_data ~ /__guard@GCC/ || scan_data ~ /__guard@@GCC/) {
-                                bad = 1;
-					print
-
-					# 194: 00000000    32 OBJECT  GLOBAL DEFAULT  UND __guard@GCC_3.0 (3)
-					# 59: 00008ee0    32 OBJECT  GLOBAL DEFAULT   22 __guard@@GCC_3.0
-					split(scan_data, scan_data_nodes)
-					ewarn("Found " scan_data_nodes[8] " in " scan_files "!")
-					print
-                            }
-                            if (scan_data ~ /readelf: Error: Unable to seek/) {
-                                bad = 1;
-                                print
-                                ewarn("Error executing readelf. Bad block? Filesystem error? in " scan_files)
-                                print
-                            }
-
-                            if (bad) {
-
-					if (auto_etcat) {
-					
-						# Use etcat that comes with gentoolkit if auto_etcat is true.
-						etcat_pipe = ("etcat belongs " scan_files)
-						(etcat_pipe) | getline etcat_belongs
-
-						while(((etcat_pipe) | getline etcat_belongs) > 0)
-							eerror(etcat_belongs != "" ? "Please emerge '>=" etcat_belongs "'": "")
-						close(etcat_pipe)
-					} else {
-					
-						eerror("You need to remerge package that above file belongs to!")
-						eerror("To find out what package it is, please emerge gentoolkit,")
-						eerror("and then run:")
-						print
-						print "    # etcat belongs " scan_files
-					}
-
-					print
-					
-					close(scan_file_pipe)
-					close(pipe)
-					exit(1)
-				}
-			}
-			close(scan_file_pipe)
-		}
-		close(pipe)
-	}
-
-	exit(0)
-}
-
-
-# vim:ts=4

diff --git a/sys-devel/gcc/files/c89 b/sys-devel/gcc/files/c89
deleted file mode 100755
index cee0325f50..0000000000
--- a/sys-devel/gcc/files/c89
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-# Call the appropriate C compiler with options to accept ANSI/ISO C
-# The following options are the same (as of gcc-2.95):
-# 	-ansi
-# 	-std=c89
-# 	-std=iso9899:1990
-
-for i; do
-    case "$i" in
-	-ansi|-std=c89|-std=iso9899:1990)
-	    ;;
-	-std=*)
-	    echo >&2 "`basename $0` called with non ANSI/ISO C90 option $i"
-	    exit 1
-	    ;;
-    esac
-done
-
-exec gcc -std=c89 -pedantic -U_FORTIFY_SOURCE "$@"

diff --git a/sys-devel/gcc/files/c99 b/sys-devel/gcc/files/c99
deleted file mode 100755
index c9542095e3..0000000000
--- a/sys-devel/gcc/files/c99
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-# Call the appropriate C compiler with options to accept ANSI/ISO C
-# The following options are the same (as of gcc-3.3):
-# 	-std=c99
-# 	-std=c9x
-# 	-std=iso9899:1999
-# 	-std=iso9899:199x
-
-for i; do
-    case "$i" in
-	-std=c9[9x]|-std=iso9899:199[9x])
-	    ;;
-	-ansi|-std=*)
-	    echo >&2 "`basename $0` called with non ANSI/ISO C99 option $i"
-	    exit 1
-	    ;;
-    esac
-done
-
-exec gcc -std=c99 -pedantic -U_FORTIFY_SOURCE ${1+"$@"}

diff --git a/sys-devel/gcc/files/fix_libtool_files.sh b/sys-devel/gcc/files/fix_libtool_files.sh
deleted file mode 100755
index 702991d1fc..0000000000
--- a/sys-devel/gcc/files/fix_libtool_files.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!@GENTOO_PORTAGE_EPREFIX@/bin/sh
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v 1.17 2014/05/20 08:00:40 rhill Exp $
-
-usage() {
-cat << "USAGE_END"
-Usage: fix_libtool_files.sh <old-gcc-version> [--oldarch <old-CHOST>]
-
-    Where <old-gcc-version> is the version number of the
-    previous gcc version.  For example, if you updated to
-    gcc-3.2.1, and you had gcc-3.2 installed, run:
-
-      # fix_libtool_files.sh 3.2
-
-    If you updated to gcc-3.2.3, and the old CHOST was i586-pc-linux-gnu
-    but you now have CHOST as i686-pc-linux-gnu, run:
-
-      # fix_libtool_files.sh 3.2 --oldarch i586-pc-linux-gnu
-
-    Note that if only the CHOST and not the version changed, you can run
-    it with the current version and the '--oldarch <old-CHOST>' arguments,
-    and it will do the expected:
-
-      # fix_libtool_files.sh `gcc -dumpversion` --oldarch i586-pc-linux-gnu
-
-USAGE_END
-	exit 1
-}
-
-case $2 in
---oldarch) [ $# -ne 3 ] && usage ;;
-*)         [ $# -ne 1 ] && usage ;;
-esac
-
-ARGV1=$1
-ARGV2=$2
-ARGV3=$3
-
-. "@GENTOO_PORTAGE_EPREFIX@"/etc/profile || exit 1
-
-# Prefix: no!
-#if [ ${EUID:-0} -ne 0 ] ; then
-#	eerror "${0##*/}: Must be root."
-#	exit 1
-#fi
-
-# make sure the files come out sane
-umask 0022
-
-OLDCHOST=
-[ "${ARGV2}" = "--oldarch" ] && OLDCHOST=${ARGV3}
-
-AWKDIR="@GENTOO_PORTAGE_EPREFIX@/usr/share/gcc-data"
-
-if [ ! -r "${AWKDIR}/fixlafiles.awk" ] ; then
-	echo "${0##*/}: ${AWKDIR}/fixlafiles.awk does not exist!"
-	exit 1
-fi
-
-OLDVER=${ARGV1}
-
-export OLDVER OLDCHOST
-
-echo "Scanning libtool files for hardcoded gcc library paths..."
-exec gawk -f "${AWKDIR}/fixlafiles.awk"
-
-# vim:ts=4

diff --git a/sys-devel/gcc/files/gcc-3.4.6-aix-largefiles.patch b/sys-devel/gcc/files/gcc-3.4.6-aix-largefiles.patch
deleted file mode 100644
index ef18736d7d..0000000000
--- a/sys-devel/gcc/files/gcc-3.4.6-aix-largefiles.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff -ruN gcc-3.4.6.orig/gcc/fixinc/fixincl.x gcc-3.4.6/gcc/fixinc/fixincl.x
---- gcc-3.4.6.orig/gcc/fixinc/fixincl.x	2005-12-16 19:18:36.000000000 +0100
-+++ gcc-3.4.6/gcc/fixinc/fixincl.x	2008-05-09 14:50:49.000000000 +0200
-@@ -2,11 +2,11 @@
-  * 
-  * DO NOT EDIT THIS FILE   (fixincl.x)
-  * 
-- * It has been AutoGen-ed  Friday December 16, 2005 at 01:14:56 PM EST
-+ * It has been AutoGen-ed  Friday May  9, 2008 at 02:47:17 PM CEST
-  * From the definitions    inclhack.def
-  * and the template file   fixincl
-  */
--/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Dec 16 13:14:56 EST 2005
-+/* DO NOT CVS-MERGE THIS FILE, EITHER Fri May  9 14:47:17 CEST 2008
-  *
-  * You must regenerate it.  Use the ./genfixes script.
-  *
-@@ -15,7 +15,7 @@
-  * certain ANSI-incompatible system header files which are fixed to work
-  * correctly with ANSI C and placed in a directory that GNU C will search.
-  *
-- * This file contains 189 fixup descriptions.
-+ * This file contains 190 fixup descriptions.
-  *
-  * See README for more information.
-  *
-@@ -42,6 +42,64 @@
- 
- /* * * * * * * * * * * * * * * * * * * * * * * * * *
-  *
-+ *  Description of Aab_Aix_Stdio fix
-+ */
-+tSCC zAab_Aix_StdioName[] =
-+     "AAB_aix_stdio";
-+
-+/*
-+ *  File name selection pattern
-+ */
-+tSCC zAab_Aix_StdioList[] =
-+  "|stdio.h|";
-+/*
-+ *  Machine/OS name selection pattern
-+ */
-+tSCC* apzAab_Aix_StdioMachs[] = {
-+        "*-*-aix*",
-+        (const char*)NULL };
-+
-+/*
-+ *  content selection pattern - do fix if pattern found
-+ */
-+tSCC zAab_Aix_StdioSelect0[] =
-+       "define fopen fopen64";
-+
-+#define    AAB_AIX_STDIO_TEST_CT  1
-+static tTestDesc aAab_Aix_StdioTests[] = {
-+  { TT_EGREP,    zAab_Aix_StdioSelect0, (regex_t*)NULL }, };
-+
-+/*
-+ *  Fix Command Arguments for Aab_Aix_Stdio
-+ */
-+static const char* apzAab_Aix_StdioPatch[] = {
-+    "wrap",
-+    "",
-+    "\n\
-+#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus\n\
-+#define __need__aix_stdio_h_fix\n\
-+#ifdef __need__aix_stdio_h_fix\n\
-+#undef fseeko\n\
-+#undef ftello\n\
-+#undef fgetpos\n\
-+#undef fsetpos\n\
-+#undef fopen\n\
-+#undef freopen\n\
-+/* Alias the symbols using asm */\n\
-+extern \"C\" {\n\
-+extern int fgetpos(FILE *, fpos64_t *) __asm__(\"fgetpos64\");\n\
-+extern FILE *fopen(const char *, const char *) __asm__(\"fopen64\");\n\
-+extern FILE *freopen(const char *, const char *, FILE *) __asm__(\"freopen64\");\n\
-+extern int fseeko(FILE *, off64_t, int) __asm__(\"fseeko64\");\n\
-+extern int fsetpos(FILE *, const fpos64_t *) __asm__(\"fsetpos64\");\n\
-+extern off64_t ftello(FILE *) __asm__(\"ftello64\");\n\
-+}\n\
-+#endif\n\
-+#endif\n",
-+    (char*)NULL };
-+
-+/* * * * * * * * * * * * * * * * * * * * * * * * * *
-+ *
-  *  Description of Aab_Fd_Zero_Asm_Posix_Types_H fix
-  */
- tSCC zAab_Fd_Zero_Asm_Posix_Types_HName[] =
-@@ -7602,14 +7660,15 @@
-  *
-  *  List of all fixes
-  */
--#define REGEX_COUNT          225
-+#define REGEX_COUNT          226
- #define MACH_LIST_SIZE_LIMIT 261
--#define FIX_COUNT            189
-+#define FIX_COUNT            190
- 
- /*
-  *  Enumerate the fixes
-  */
- typedef enum {
-+    AAB_AIX_STDIO_FIXIDX,
-     AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX,
-     AAB_FD_ZERO_GNU_TYPES_H_FIXIDX,
-     AAB_FD_ZERO_SELECTBITS_H_FIXIDX,
-@@ -7802,6 +7861,11 @@
- } t_fixinc_idx;
- 
- tFixDesc fixDescList[ FIX_COUNT ] = {
-+  {  zAab_Aix_StdioName,    zAab_Aix_StdioList,
-+     apzAab_Aix_StdioMachs,
-+     AAB_AIX_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-+     aAab_Aix_StdioTests,   apzAab_Aix_StdioPatch, 0 },
-+
-   {  zAab_Fd_Zero_Asm_Posix_Types_HName,    zAab_Fd_Zero_Asm_Posix_Types_HList,
-      apzAab_Fd_Zero_Asm_Posix_Types_HMachs,
-      AAB_FD_ZERO_ASM_POSIX_TYPES_H_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-diff -ruN gcc-3.4.6.orig/gcc/fixinc/inclhack.def gcc-3.4.6/gcc/fixinc/inclhack.def
---- gcc-3.4.6.orig/gcc/fixinc/inclhack.def	2005-12-16 19:18:36.000000000 +0100
-+++ gcc-3.4.6/gcc/fixinc/inclhack.def	2008-05-09 14:47:15.000000000 +0200
-@@ -20,6 +20,47 @@
- FIXINC_DEBUG = yes;
- #endif
- 
-+/* On AIX when _LARGE_FILES is defined stdio.h defines fopen to
-+ * fopen64 etc. and this causes problems when building with g++
-+ * because cstdio udefs everything from stdio.h, leaving us with
-+ * ::fopen has not been declared errors. This fixes stdio.h to
-+ * undef those defines and use __asm__ to alias the symbols if
-+ * building with g++ and -D_LARGE_FILES
-+ */
-+fix = {
-+	hackname  = AAB_aix_stdio;
-+	files     = stdio.h;
-+	select    = "define fopen fopen64";
-+	mach      = "*-*-aix*";
-+
-+	c_fix	  = wrap;
-+
-+	c_fix_arg = "";
-+
-+	c_fix_arg = "\n" 
-+	"#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus\n"
-+	"#define __need__aix_stdio_h_fix\n"
-+	"#ifdef __need__aix_stdio_h_fix\n"
-+	"#undef fseeko\n"
-+	"#undef ftello\n"
-+	"#undef fgetpos\n"
-+	"#undef fsetpos\n"
-+	"#undef fopen\n"
-+	"#undef freopen\n"
-+	"/* Alias the symbols using asm */\n"
-+	"extern \"C\" {\n"
-+	"extern int fgetpos(FILE *, fpos64_t *) __asm__(\"fgetpos64\");\n"
-+	"extern FILE *fopen(const char *, const char *) __asm__(\"fopen64\");\n"
-+	"extern FILE *freopen(const char *, const char *, FILE *) __asm__(\"freopen64\");\n"
-+	"extern int fseeko(FILE *, off64_t, int) __asm__(\"fseeko64\");\n"
-+	"extern int fsetpos(FILE *, const fpos64_t *) __asm__(\"fsetpos64\");\n"
-+	"extern off64_t ftello(FILE *) __asm__(\"ftello64\");\n"
-+	"}\n"
-+	"#endif\n"
-+	"#endif\n";
-+	test_text = "";
-+};
-+
- /*
-  *  This fixes __FD_ZERO bug for linux 2.x.y (x <= 2 && y <= some n)
-  */
-diff -ruN gcc-3.4.6.orig/gcc/fixinc/tests/base/stdio.h gcc-3.4.6/gcc/fixinc/tests/base/stdio.h
---- gcc-3.4.6.orig/gcc/fixinc/tests/base/stdio.h	2004-01-21 20:50:12.000000000 +0100
-+++ gcc-3.4.6/gcc/fixinc/tests/base/stdio.h	2008-05-09 14:46:26.000000000 +0200
-@@ -14,6 +14,11 @@
- #include <stdarg.h>
- 
- 
-+#if defined( AAB_AIX_STDIO_CHECK )
-+
-+#endif  /* AAB_AIX_STDIO_CHECK */
-+
-+
- #if defined( ALPHA_GETOPT_CHECK )
- extern int getopt(int, char *const[], const char *);
- #endif  /* ALPHA_GETOPT_CHECK */
-diff -ruN gcc-3.4.6.orig/gcc/testsuite/g++.dg/other/pr20366.C gcc-3.4.6/gcc/testsuite/g++.dg/other/pr20366.C
---- gcc-3.4.6.orig/gcc/testsuite/g++.dg/other/pr20366.C	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-3.4.6/gcc/testsuite/g++.dg/other/pr20366.C	2008-05-09 14:46:26.000000000 +0200
-@@ -0,0 +1,80 @@
-+// Test fix for PR20366
-+// 
-+// { dg-do compile  { target *-*-aix* } }
-+// { dg-options "-D_LARGE_FILES" }
-+//
-+// cstdio includes stdio.h and undefs most of the functions declared
-+// therein, unfortunately this means that #define fopen fopen64 goes
-+// away. This tests the fix, and ensures that with -D_LARGE_FILES
-+// fopen et. al. are indeed aliased to the large file equivalents.
-+//
-+// There are many other #define foo foo64 in the AIX headers, but
-+// these all work out fine as they are not undefined in libstdc++.
-+// This list is probably incomplete:
-+//
-+// Symbol          Return type     Large file declaration.
-+// 
-+// aio.h                      (different for different AIX versions)
-+// =====
-+// aio_read        int        aio_read64(int, struct aiocb64 *);
-+// aio_write       int        aio_write64(int, struct aiocb64 *);
-+// lio_listio      int        lio_listio64(int, struct liocb64 *[], int, void *);
-+// aio_cancel      int        aio_cancel64(int, struct aiocb64 *);
-+// aio_suspend     int        aio_suspend64(int, struct aiocb64 *[]);
-+// 
-+// stdio.h
-+// =======
-+// fgetpos         int        fgetpos64(FILE *, fpos64_t *);
-+// fopen           FILE      *fopen64(const char *, const char *);
-+// freopen         FILE      *freopen64(const char *, const char *, FILE *);
-+// fseeko          int        fseeko64(FILE *, off64_t, int);
-+// fsetpos         int        fsetpos64(FILE *, const fpos64_t *);
-+// ftello          off64_t    ftello64(FILE *);
-+// 
-+// unistd.h
-+// ========
-+// fclear          off64_t    fclear64(int, off64_t);
-+// fsync_range     int        fsync_range64(int, int, off64_t, off64_t);
-+// ftruncate       int        ftruncate64(int, off64_t);
-+// truncate        int        truncate64(const char *, off64_t);
-+// lseek           off64_t    lseek64(int, off64_t, int);
-+// pread           ssize_t    pread64(int, void *, size_t, off64_t);
-+// pwrite          ssize_t    pwrite64(int, const void *, size_t, off64_t);
-+// 
-+// fcntl.h
-+// =======
-+// open            int        open64(const char *, int, ...);
-+// creat           int        creat64(const char *, mode_t);
-+// 
-+// sys/stat.h
-+// ==========
-+// stat            int        stat64(const char *, struct stat64 *);
-+// fstat           int        fstat64(int, struct stat64 *);
-+// lstat           int        lstat64(const char *, struct stat64 *);
-+// 
-+// stdlib.h
-+// ========
-+// mkstemp         int        mkstemp64(char *);
-+// 
-+// ftw.h
-+// =====
-+// ftw             int        ftw64(const char *, int (*)(const char *,const struct stat64 *, int), int);
-+// nftw            int        nftw64(const char *, int (*)(const char *, const struct stat64 *, int, struct FTW*), int, int);
-+//
-+// It seems unlikely that any of these will be used (and #undef'ed) by
-+// libstdc++ in the future, if they are then this test and its
-+// associated patch to fixincludes will have to be revisited.
-+
-+#include <cstdio>
-+
-+extern "C" {
-+int        fgetpos(FILE *, fpos64_t *);
-+FILE      *fopen(const char *, const char *);
-+FILE      *freopen(const char *, const char *, FILE *);
-+int        fseeko(FILE *, off64_t, int);
-+int        fsetpos(FILE *, const fpos64_t *);
-+off64_t    ftello(FILE *);
-+}
-+int main() { 
-+  return 0;
-+}

diff --git a/sys-devel/gcc/files/gcc-4.2-ia64-hpux-always-pthread.patch b/sys-devel/gcc/files/gcc-4.2-ia64-hpux-always-pthread.patch
deleted file mode 100644
index 1ddba03a07..0000000000
--- a/sys-devel/gcc/files/gcc-4.2-ia64-hpux-always-pthread.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://archives.gentoo.org/gentoo-portage-dev/msg_a98f2d22e6ec550bd55246a95768628d.xml
-
---- gcc/config/ia64/hpux.h.orig	2009-07-30 16:43:06 +0200
-+++ gcc/config/ia64/hpux.h	2009-07-30 16:43:36 +0200
-@@ -60,7 +60,7 @@
- 
- #undef CPP_SPEC
- #define CPP_SPEC \
--  "%{mt|pthread:-D_REENTRANT -D_THREAD_SAFE -D_POSIX_C_SOURCE=199506L}"
-+  "%{mt|pthread:}-D_REENTRANT -D_THREAD_SAFE -D_POSIX_C_SOURCE=199506L"
- /* aCC defines also -DRWSTD_MULTI_THREAD, -DRW_MULTI_THREAD.  These
-    affect only aCC's C++ library (Rogue Wave-derived) which we do not
-    use, and they violate the user's name space.  */
-@@ -86,7 +86,7 @@
- #undef  LIB_SPEC
- #define LIB_SPEC \
-   "%{!shared: \
--     %{mt|pthread:-lpthread} \
-+     %{mt|pthread:}-lpthread \
-      %{p:%{!mlp64:-L/usr/lib/hpux32/libp} \
- 	 %{mlp64:-L/usr/lib/hpux64/libp} -lprof} \
-      %{pg:%{!mlp64:-L/usr/lib/hpux32/libp} \

diff --git a/sys-devel/gcc/files/gcc-4.2-pa-hpux-libgcc_s-soname.patch b/sys-devel/gcc/files/gcc-4.2-pa-hpux-libgcc_s-soname.patch
deleted file mode 100644
index b8e059367d..0000000000
--- a/sys-devel/gcc/files/gcc-4.2-pa-hpux-libgcc_s-soname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-http://gcc.gnu.org/PR40913
-
---- gcc/config/pa/t-hpux-shlib.orig	2009-07-30 11:06:20 +0200
-+++ gcc/config/pa/t-hpux-shlib	2009-07-30 11:09:35 +0200
-@@ -8,6 +8,7 @@
- SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
- 
- SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared  -nodefaultlibs \
-+	-Wl,+h -Wl,$(SHLIB_SONAME) \
- 	-o $(SHLIB_DIR)/$(SHLIB_NAME).tmp @multilib_flags@ $(SHLIB_OBJS) && \
-         rm -f $(SHLIB_DIR)/$(SHLIB_SONAME) && \
- 	if [ -f $(SHLIB_DIR)/$(SHLIB_NAME) ]; then \

diff --git a/sys-devel/gcc/files/gcc-4.2.3-aix-largefiles.patch b/sys-devel/gcc/files/gcc-4.2.3-aix-largefiles.patch
deleted file mode 100644
index 87161579be..0000000000
--- a/sys-devel/gcc/files/gcc-4.2.3-aix-largefiles.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff -ruN gcc-4.2.3.orig/fixincludes/fixincl.x gcc-4.2.3/fixincludes/fixincl.x
---- gcc-4.2.3.orig/fixincludes/fixincl.x	2007-07-21 23:57:21.000000000 +0200
-+++ gcc-4.2.3/fixincludes/fixincl.x	2008-04-04 16:39:59.000000000 +0200
-@@ -2,11 +2,11 @@
-  * 
-  * DO NOT EDIT THIS FILE   (fixincl.x)
-  * 
-- * It has been AutoGen-ed  Saturday July 21, 2007 at 05:44:12 PM EDT
-+ * It has been AutoGen-ed  Friday April  4, 2008 at 04:35:28 PM CEST
-  * From the definitions    inclhack.def
-  * and the template file   fixincl
-  */
--/* DO NOT CVS-MERGE THIS FILE, EITHER Sat Jul 21 17:44:12 EDT 2007
-+/* DO NOT CVS-MERGE THIS FILE, EITHER Fri Apr  4 16:35:28 CEST 2008
-  *
-  * You must regenerate it.  Use the ./genfixes script.
-  *
-@@ -15,7 +15,7 @@
-  * certain ANSI-incompatible system header files which are fixed to work
-  * correctly with ANSI C and placed in a directory that GNU C will search.
-  *
-- * This file contains 204 fixup descriptions.
-+ * This file contains 205 fixup descriptions.
-  *
-  * See README for more information.
-  *
-@@ -42,6 +42,64 @@
- 
- /* * * * * * * * * * * * * * * * * * * * * * * * * *
-  *
-+ *  Description of Aab_Aix_Stdio fix
-+ */
-+tSCC zAab_Aix_StdioName[] =
-+     "AAB_aix_stdio";
-+
-+/*
-+ *  File name selection pattern
-+ */
-+tSCC zAab_Aix_StdioList[] =
-+  "|stdio.h|";
-+/*
-+ *  Machine/OS name selection pattern
-+ */
-+tSCC* apzAab_Aix_StdioMachs[] = {
-+        "*-*-aix*",
-+        (const char*)NULL };
-+
-+/*
-+ *  content selection pattern - do fix if pattern found
-+ */
-+tSCC zAab_Aix_StdioSelect0[] =
-+       "define fopen fopen64";
-+
-+#define    AAB_AIX_STDIO_TEST_CT  1
-+static tTestDesc aAab_Aix_StdioTests[] = {
-+  { TT_EGREP,    zAab_Aix_StdioSelect0, (regex_t*)NULL }, };
-+
-+/*
-+ *  Fix Command Arguments for Aab_Aix_Stdio
-+ */
-+static const char* apzAab_Aix_StdioPatch[] = {
-+    "wrap",
-+    "",
-+    "\n\
-+#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus\n\
-+#define __need__aix_stdio_h_fix\n\
-+#ifdef __need__aix_stdio_h_fix\n\
-+#undef fseeko\n\
-+#undef ftello\n\
-+#undef fgetpos\n\
-+#undef fsetpos\n\
-+#undef fopen\n\
-+#undef freopen\n\
-+/* Alias the symbols using asm */\n\
-+extern \"C\" {\n\
-+extern int fgetpos(FILE *, fpos64_t *) __asm__(\"fgetpos64\");\n\
-+extern FILE *fopen(const char *, const char *) __asm__(\"fopen64\");\n\
-+extern FILE *freopen(const char *, const char *, FILE *) __asm__(\"freopen64\");\n\
-+extern int fseeko(FILE *, off64_t, int) __asm__(\"fseeko64\");\n\
-+extern int fsetpos(FILE *, const fpos64_t *) __asm__(\"fsetpos64\");\n\
-+extern off64_t ftello(FILE *) __asm__(\"ftello64\");\n\
-+}\n\
-+#endif\n\
-+#endif\n",
-+    (char*)NULL };
-+
-+/* * * * * * * * * * * * * * * * * * * * * * * * * *
-+ *
-  *  Description of Aab_Darwin7_9_Long_Double_Funcs fix
-  */
- tSCC zAab_Darwin7_9_Long_Double_FuncsName[] =
-@@ -8306,14 +8364,15 @@
-  *
-  *  List of all fixes
-  */
--#define REGEX_COUNT          246
-+#define REGEX_COUNT          247
- #define MACH_LIST_SIZE_LIMIT 261
--#define FIX_COUNT            204
-+#define FIX_COUNT            205
- 
- /*
-  *  Enumerate the fixes
-  */
- typedef enum {
-+    AAB_AIX_STDIO_FIXIDX,
-     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_FIXIDX,
-     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
-     AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX,
-@@ -8521,6 +8580,11 @@
- } t_fixinc_idx;
- 
- tFixDesc fixDescList[ FIX_COUNT ] = {
-+  {  zAab_Aix_StdioName,    zAab_Aix_StdioList,
-+     apzAab_Aix_StdioMachs,
-+     AAB_AIX_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-+     aAab_Aix_StdioTests,   apzAab_Aix_StdioPatch, 0 },
-+
-   {  zAab_Darwin7_9_Long_Double_FuncsName,    zAab_Darwin7_9_Long_Double_FuncsList,
-      apzAab_Darwin7_9_Long_Double_FuncsMachs,
-      AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-diff -ruN gcc-4.2.3.orig/fixincludes/inclhack.def gcc-4.2.3/fixincludes/inclhack.def
---- gcc-4.2.3.orig/fixincludes/inclhack.def	2007-07-21 23:57:21.000000000 +0200
-+++ gcc-4.2.3/fixincludes/inclhack.def	2008-04-04 16:34:03.000000000 +0200
-@@ -20,6 +20,47 @@
- FIXINC_DEBUG = yes;
- #endif
- 
-+/* On AIX when _LARGE_FILES is defined stdio.h defines fopen to
-+ * fopen64 etc. and this causes problems when building with g++
-+ * because cstdio udefs everything from stdio.h, leaving us with
-+ * ::fopen has not been declared errors. This fixes stdio.h to
-+ * undef those defines and use __asm__ to alias the symbols if
-+ * building with g++ and -D_LARGE_FILES
-+ */
-+fix = {
-+	hackname  = AAB_aix_stdio;
-+	files     = stdio.h;
-+	select    = "define fopen fopen64";
-+	mach      = "*-*-aix*";
-+
-+	c_fix	  = wrap;
-+
-+	c_fix_arg = "";
-+
-+	c_fix_arg = "\n" 
-+	"#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus\n"
-+	"#define __need__aix_stdio_h_fix\n"
-+	"#ifdef __need__aix_stdio_h_fix\n"
-+	"#undef fseeko\n"
-+	"#undef ftello\n"
-+	"#undef fgetpos\n"
-+	"#undef fsetpos\n"
-+	"#undef fopen\n"
-+	"#undef freopen\n"
-+	"/* Alias the symbols using asm */\n"
-+	"extern \"C\" {\n"
-+	"extern int fgetpos(FILE *, fpos64_t *) __asm__(\"fgetpos64\");\n"
-+	"extern FILE *fopen(const char *, const char *) __asm__(\"fopen64\");\n"
-+	"extern FILE *freopen(const char *, const char *, FILE *) __asm__(\"freopen64\");\n"
-+	"extern int fseeko(FILE *, off64_t, int) __asm__(\"fseeko64\");\n"
-+	"extern int fsetpos(FILE *, const fpos64_t *) __asm__(\"fsetpos64\");\n"
-+	"extern off64_t ftello(FILE *) __asm__(\"ftello64\");\n"
-+	"}\n"
-+	"#endif\n"
-+	"#endif\n";
-+	test_text = "";
-+};
-+
- 
- /*
-  *  On Mac OS 10.3.9, the 'long double' functions are available in
-diff -ruN gcc-4.2.3.orig/fixincludes/tests/base/stdio.h gcc-4.2.3/fixincludes/tests/base/stdio.h
---- gcc-4.2.3.orig/fixincludes/tests/base/stdio.h	2004-08-31 11:27:00.000000000 +0200
-+++ gcc-4.2.3/fixincludes/tests/base/stdio.h	2008-04-04 16:34:03.000000000 +0200
-@@ -14,6 +14,11 @@
- #include <stdarg.h>
- 
- 
-+#if defined( AAB_AIX_STDIO_CHECK )
-+
-+#endif  /* AAB_AIX_STDIO_CHECK */
-+
-+
- #if defined( ALPHA_GETOPT_CHECK )
- extern int getopt(int, char *const[], const char *);
- #endif  /* ALPHA_GETOPT_CHECK */
-diff -ruN gcc-4.2.3.orig/gcc/testsuite/g++.dg/other/pr20366.C gcc-4.2.3/gcc/testsuite/g++.dg/other/pr20366.C
---- gcc-4.2.3.orig/gcc/testsuite/g++.dg/other/pr20366.C	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.3/gcc/testsuite/g++.dg/other/pr20366.C	2008-04-04 16:34:03.000000000 +0200
-@@ -0,0 +1,80 @@
-+// Test fix for PR20366
-+// 
-+// { dg-do compile  { target *-*-aix* } }
-+// { dg-options "-D_LARGE_FILES" }
-+//
-+// cstdio includes stdio.h and undefs most of the functions declared
-+// therein, unfortunately this means that #define fopen fopen64 goes
-+// away. This tests the fix, and ensures that with -D_LARGE_FILES
-+// fopen et. al. are indeed aliased to the large file equivalents.
-+//
-+// There are many other #define foo foo64 in the AIX headers, but
-+// these all work out fine as they are not undefined in libstdc++.
-+// This list is probably incomplete:
-+//
-+// Symbol          Return type     Large file declaration.
-+// 
-+// aio.h                      (different for different AIX versions)
-+// =====
-+// aio_read        int        aio_read64(int, struct aiocb64 *);
-+// aio_write       int        aio_write64(int, struct aiocb64 *);
-+// lio_listio      int        lio_listio64(int, struct liocb64 *[], int, void *);
-+// aio_cancel      int        aio_cancel64(int, struct aiocb64 *);
-+// aio_suspend     int        aio_suspend64(int, struct aiocb64 *[]);
-+// 
-+// stdio.h
-+// =======
-+// fgetpos         int        fgetpos64(FILE *, fpos64_t *);
-+// fopen           FILE      *fopen64(const char *, const char *);
-+// freopen         FILE      *freopen64(const char *, const char *, FILE *);
-+// fseeko          int        fseeko64(FILE *, off64_t, int);
-+// fsetpos         int        fsetpos64(FILE *, const fpos64_t *);
-+// ftello          off64_t    ftello64(FILE *);
-+// 
-+// unistd.h
-+// ========
-+// fclear          off64_t    fclear64(int, off64_t);
-+// fsync_range     int        fsync_range64(int, int, off64_t, off64_t);
-+// ftruncate       int        ftruncate64(int, off64_t);
-+// truncate        int        truncate64(const char *, off64_t);
-+// lseek           off64_t    lseek64(int, off64_t, int);
-+// pread           ssize_t    pread64(int, void *, size_t, off64_t);
-+// pwrite          ssize_t    pwrite64(int, const void *, size_t, off64_t);
-+// 
-+// fcntl.h
-+// =======
-+// open            int        open64(const char *, int, ...);
-+// creat           int        creat64(const char *, mode_t);
-+// 
-+// sys/stat.h
-+// ==========
-+// stat            int        stat64(const char *, struct stat64 *);
-+// fstat           int        fstat64(int, struct stat64 *);
-+// lstat           int        lstat64(const char *, struct stat64 *);
-+// 
-+// stdlib.h
-+// ========
-+// mkstemp         int        mkstemp64(char *);
-+// 
-+// ftw.h
-+// =====
-+// ftw             int        ftw64(const char *, int (*)(const char *,const struct stat64 *, int), int);
-+// nftw            int        nftw64(const char *, int (*)(const char *, const struct stat64 *, int, struct FTW*), int, int);
-+//
-+// It seems unlikely that any of these will be used (and #undef'ed) by
-+// libstdc++ in the future, if they are then this test and its
-+// associated patch to fixincludes will have to be revisited.
-+
-+#include <cstdio>
-+
-+extern "C" {
-+int        fgetpos(FILE *, fpos64_t *);
-+FILE      *fopen(const char *, const char *);
-+FILE      *freopen(const char *, const char *, FILE *);
-+int        fseeko(FILE *, off64_t, int);
-+int        fsetpos(FILE *, const fpos64_t *);
-+off64_t    ftello(FILE *);
-+}
-+int main() { 
-+  return 0;
-+}

diff --git a/sys-devel/gcc/files/gcc-4.2.4-aix-largefiles.patch b/sys-devel/gcc/files/gcc-4.2.4-aix-largefiles.patch
deleted file mode 100644
index d6b92fbfcc..0000000000
--- a/sys-devel/gcc/files/gcc-4.2.4-aix-largefiles.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff -ruN gcc-4.2.4.orig/fixincludes/fixincl.x gcc-4.2.4/fixincludes/fixincl.x
---- gcc-4.2.4.orig/fixincludes/fixincl.x	2008-03-13 22:28:10.000000000 +0100
-+++ gcc-4.2.4/fixincludes/fixincl.x	2008-07-03 16:44:27.000000000 +0200
-@@ -2,11 +2,11 @@
-  * 
-  * DO NOT EDIT THIS FILE   (fixincl.x)
-  * 
-- * It has been AutoGen-ed  Thursday February 21, 2008 at 09:53:39 PM CET
-+ * It has been AutoGen-ed  Thursday July  3, 2008 at 04:44:27 PM CEST
-  * From the definitions    inclhack.def
-  * and the template file   fixincl
-  */
--/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Feb 21 21:53:39 CET 2008
-+/* DO NOT CVS-MERGE THIS FILE, EITHER Thu Jul  3 16:44:27 CEST 2008
-  *
-  * You must regenerate it.  Use the ./genfixes script.
-  *
-@@ -15,7 +15,7 @@
-  * certain ANSI-incompatible system header files which are fixed to work
-  * correctly with ANSI C and placed in a directory that GNU C will search.
-  *
-- * This file contains 205 fixup descriptions.
-+ * This file contains 206 fixup descriptions.
-  *
-  * See README for more information.
-  *
-@@ -38,6 +38,64 @@
- 
- /* * * * * * * * * * * * * * * * * * * * * * * * * *
-  *
-+ *  Description of Aab_Aix_Stdio fix
-+ */
-+tSCC zAab_Aix_StdioName[] =
-+     "AAB_aix_stdio";
-+
-+/*
-+ *  File name selection pattern
-+ */
-+tSCC zAab_Aix_StdioList[] =
-+  "|stdio.h|";
-+/*
-+ *  Machine/OS name selection pattern
-+ */
-+tSCC* apzAab_Aix_StdioMachs[] = {
-+        "*-*-aix*",
-+        (const char*)NULL };
-+
-+/*
-+ *  content selection pattern - do fix if pattern found
-+ */
-+tSCC zAab_Aix_StdioSelect0[] =
-+       "define fopen fopen64";
-+
-+#define    AAB_AIX_STDIO_TEST_CT  1
-+static tTestDesc aAab_Aix_StdioTests[] = {
-+  { TT_EGREP,    zAab_Aix_StdioSelect0, (regex_t*)NULL }, };
-+
-+/*
-+ *  Fix Command Arguments for Aab_Aix_Stdio
-+ */
-+static const char* apzAab_Aix_StdioPatch[] = {
-+    "wrap",
-+    "",
-+    "\n\
-+#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus\n\
-+#define __need__aix_stdio_h_fix\n\
-+#ifdef __need__aix_stdio_h_fix\n\
-+#undef fseeko\n\
-+#undef ftello\n\
-+#undef fgetpos\n\
-+#undef fsetpos\n\
-+#undef fopen\n\
-+#undef freopen\n\
-+/* Alias the symbols using asm */\n\
-+extern \"C\" {\n\
-+extern int fgetpos(FILE *, fpos64_t *) __asm__(\"fgetpos64\");\n\
-+extern FILE *fopen(const char *, const char *) __asm__(\"fopen64\");\n\
-+extern FILE *freopen(const char *, const char *, FILE *) __asm__(\"freopen64\");\n\
-+extern int fseeko(FILE *, off64_t, int) __asm__(\"fseeko64\");\n\
-+extern int fsetpos(FILE *, const fpos64_t *) __asm__(\"fsetpos64\");\n\
-+extern off64_t ftello(FILE *) __asm__(\"ftello64\");\n\
-+}\n\
-+#endif\n\
-+#endif\n",
-+    (char*)NULL };
-+
-+/* * * * * * * * * * * * * * * * * * * * * * * * * *
-+ *
-  *  Description of Aab_Darwin7_9_Long_Double_Funcs fix
-  */
- tSCC zAab_Darwin7_9_Long_Double_FuncsName[] =
-@@ -8348,14 +8406,15 @@
-  *
-  *  List of all fixes
-  */
--#define REGEX_COUNT          247
-+#define REGEX_COUNT          248
- #define MACH_LIST_SIZE_LIMIT 261
--#define FIX_COUNT            205
-+#define FIX_COUNT            206
- 
- /*
-  *  Enumerate the fixes
-  */
- typedef enum {
-+    AAB_AIX_STDIO_FIXIDX,
-     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_FIXIDX,
-     AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_2_FIXIDX,
-     AAB_FD_ZERO_ASM_POSIX_TYPES_H_FIXIDX,
-@@ -8564,6 +8623,11 @@
- } t_fixinc_idx;
- 
- tFixDesc fixDescList[ FIX_COUNT ] = {
-+  {  zAab_Aix_StdioName,    zAab_Aix_StdioList,
-+     apzAab_Aix_StdioMachs,
-+     AAB_AIX_STDIO_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-+     aAab_Aix_StdioTests,   apzAab_Aix_StdioPatch, 0 },
-+
-   {  zAab_Darwin7_9_Long_Double_FuncsName,    zAab_Darwin7_9_Long_Double_FuncsList,
-      apzAab_Darwin7_9_Long_Double_FuncsMachs,
-      AAB_DARWIN7_9_LONG_DOUBLE_FUNCS_TEST_CT, FD_MACH_ONLY | FD_REPLACEMENT,
-diff -ruN gcc-4.2.4.orig/fixincludes/inclhack.def gcc-4.2.4/fixincludes/inclhack.def
---- gcc-4.2.4.orig/fixincludes/inclhack.def	2008-03-13 22:28:10.000000000 +0100
-+++ gcc-4.2.4/fixincludes/inclhack.def	2008-07-03 16:43:52.000000000 +0200
-@@ -20,6 +20,47 @@
- FIXINC_DEBUG = yes;
- #endif
- 
-+/* On AIX when _LARGE_FILES is defined stdio.h defines fopen to
-+ * fopen64 etc. and this causes problems when building with g++
-+ * because cstdio udefs everything from stdio.h, leaving us with
-+ * ::fopen has not been declared errors. This fixes stdio.h to
-+ * undef those defines and use __asm__ to alias the symbols if
-+ * building with g++ and -D_LARGE_FILES
-+ */
-+fix = {
-+	hackname  = AAB_aix_stdio;
-+	files     = stdio.h;
-+	select    = "define fopen fopen64";
-+	mach      = "*-*-aix*";
-+
-+	c_fix	  = wrap;
-+
-+	c_fix_arg = "";
-+
-+	c_fix_arg = "\n" 
-+	"#if defined __GNUG__ && defined _LARGE_FILES && defined __cplusplus\n"
-+	"#define __need__aix_stdio_h_fix\n"
-+	"#ifdef __need__aix_stdio_h_fix\n"
-+	"#undef fseeko\n"
-+	"#undef ftello\n"
-+	"#undef fgetpos\n"
-+	"#undef fsetpos\n"
-+	"#undef fopen\n"
-+	"#undef freopen\n"
-+	"/* Alias the symbols using asm */\n"
-+	"extern \"C\" {\n"
-+	"extern int fgetpos(FILE *, fpos64_t *) __asm__(\"fgetpos64\");\n"
-+	"extern FILE *fopen(const char *, const char *) __asm__(\"fopen64\");\n"
-+	"extern FILE *freopen(const char *, const char *, FILE *) __asm__(\"freopen64\");\n"
-+	"extern int fseeko(FILE *, off64_t, int) __asm__(\"fseeko64\");\n"
-+	"extern int fsetpos(FILE *, const fpos64_t *) __asm__(\"fsetpos64\");\n"
-+	"extern off64_t ftello(FILE *) __asm__(\"ftello64\");\n"
-+	"}\n"
-+	"#endif\n"
-+	"#endif\n";
-+	test_text = "";
-+};
-+
- 
- /*
-  *  On Mac OS 10.3.9, the 'long double' functions are available in
-diff -ruN gcc-4.2.4.orig/fixincludes/tests/base/stdio.h gcc-4.2.4/fixincludes/tests/base/stdio.h
---- gcc-4.2.4.orig/fixincludes/tests/base/stdio.h	2004-08-31 11:27:00.000000000 +0200
-+++ gcc-4.2.4/fixincludes/tests/base/stdio.h	2008-07-03 16:43:52.000000000 +0200
-@@ -14,6 +14,11 @@
- #include <stdarg.h>
- 
- 
-+#if defined( AAB_AIX_STDIO_CHECK )
-+
-+#endif  /* AAB_AIX_STDIO_CHECK */
-+
-+
- #if defined( ALPHA_GETOPT_CHECK )
- extern int getopt(int, char *const[], const char *);
- #endif  /* ALPHA_GETOPT_CHECK */
-diff -ruN gcc-4.2.4.orig/gcc/testsuite/g++.dg/other/pr20366.C gcc-4.2.4/gcc/testsuite/g++.dg/other/pr20366.C
---- gcc-4.2.4.orig/gcc/testsuite/g++.dg/other/pr20366.C	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.2.4/gcc/testsuite/g++.dg/other/pr20366.C	2008-07-03 16:43:52.000000000 +0200
-@@ -0,0 +1,80 @@
-+// Test fix for PR20366
-+// 
-+// { dg-do compile  { target *-*-aix* } }
-+// { dg-options "-D_LARGE_FILES" }
-+//
-+// cstdio includes stdio.h and undefs most of the functions declared
-+// therein, unfortunately this means that #define fopen fopen64 goes
-+// away. This tests the fix, and ensures that with -D_LARGE_FILES
-+// fopen et. al. are indeed aliased to the large file equivalents.
-+//
-+// There are many other #define foo foo64 in the AIX headers, but
-+// these all work out fine as they are not undefined in libstdc++.
-+// This list is probably incomplete:
-+//
-+// Symbol          Return type     Large file declaration.
-+// 
-+// aio.h                      (different for different AIX versions)
-+// =====
-+// aio_read        int        aio_read64(int, struct aiocb64 *);
-+// aio_write       int        aio_write64(int, struct aiocb64 *);
-+// lio_listio      int        lio_listio64(int, struct liocb64 *[], int, void *);
-+// aio_cancel      int        aio_cancel64(int, struct aiocb64 *);
-+// aio_suspend     int        aio_suspend64(int, struct aiocb64 *[]);
-+// 
-+// stdio.h
-+// =======
-+// fgetpos         int        fgetpos64(FILE *, fpos64_t *);
-+// fopen           FILE      *fopen64(const char *, const char *);
-+// freopen         FILE      *freopen64(const char *, const char *, FILE *);
-+// fseeko          int        fseeko64(FILE *, off64_t, int);
-+// fsetpos         int        fsetpos64(FILE *, const fpos64_t *);
-+// ftello          off64_t    ftello64(FILE *);
-+// 
-+// unistd.h
-+// ========
-+// fclear          off64_t    fclear64(int, off64_t);
-+// fsync_range     int        fsync_range64(int, int, off64_t, off64_t);
-+// ftruncate       int        ftruncate64(int, off64_t);
-+// truncate        int        truncate64(const char *, off64_t);
-+// lseek           off64_t    lseek64(int, off64_t, int);
-+// pread           ssize_t    pread64(int, void *, size_t, off64_t);
-+// pwrite          ssize_t    pwrite64(int, const void *, size_t, off64_t);
-+// 
-+// fcntl.h
-+// =======
-+// open            int        open64(const char *, int, ...);
-+// creat           int        creat64(const char *, mode_t);
-+// 
-+// sys/stat.h
-+// ==========
-+// stat            int        stat64(const char *, struct stat64 *);
-+// fstat           int        fstat64(int, struct stat64 *);
-+// lstat           int        lstat64(const char *, struct stat64 *);
-+// 
-+// stdlib.h
-+// ========
-+// mkstemp         int        mkstemp64(char *);
-+// 
-+// ftw.h
-+// =====
-+// ftw             int        ftw64(const char *, int (*)(const char *,const struct stat64 *, int), int);
-+// nftw            int        nftw64(const char *, int (*)(const char *, const struct stat64 *, int, struct FTW*), int, int);
-+//
-+// It seems unlikely that any of these will be used (and #undef'ed) by
-+// libstdc++ in the future, if they are then this test and its
-+// associated patch to fixincludes will have to be revisited.
-+
-+#include <cstdio>
-+
-+extern "C" {
-+int        fgetpos(FILE *, fpos64_t *);
-+FILE      *fopen(const char *, const char *);
-+FILE      *freopen(const char *, const char *, FILE *);
-+int        fseeko(FILE *, off64_t, int);
-+int        fsetpos(FILE *, const fpos64_t *);
-+off64_t    ftello(FILE *);
-+}
-+int main() { 
-+  return 0;
-+}

diff --git a/sys-devel/gcc/files/gcc-4.2.4-interix-all-source.patch b/sys-devel/gcc/files/gcc-4.2.4-interix-all-source.patch
deleted file mode 100644
index 346a5d670e..0000000000
--- a/sys-devel/gcc/files/gcc-4.2.4-interix-all-source.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru gcc-4.2.4.orig/gcc/config/i386/i386-interix.h gcc-4.2.4/gcc/config/i386/i386-interix.h
---- gcc-4.2.4.orig/gcc/config/i386/i386-interix.h	2008-07-16 09:44:45 +0200
-+++ gcc-4.2.4/gcc/config/i386/i386-interix.h	2008-07-16 09:55:50 +0200
-@@ -61,6 +61,7 @@
-     {									\
- 	builtin_define ("__INTERIX");					\
- 	builtin_define ("__OPENNT");					\
-+	builtin_define ("_ALL_SOURCE");					\
- 	builtin_define ("_M_IX86=600");					\
- 	builtin_define ("_X86_=1");					\
- 	builtin_define ("__stdcall=__attribute__((__stdcall__))");	\

diff --git a/sys-devel/gcc/files/gcc-4.2.4-interix-long-double.patch b/sys-devel/gcc/files/gcc-4.2.4-interix-long-double.patch
deleted file mode 100644
index d92518a275..0000000000
--- a/sys-devel/gcc/files/gcc-4.2.4-interix-long-double.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru gcc-4.2.4.orig/gcc/config/interix.h gcc-4.2.4/gcc/config/interix.h
---- gcc-4.2.4.orig/gcc/config/interix.h	2011-09-09 08:51:18 +0200
-+++ gcc-4.2.4/gcc/config/interix.h	2011-09-09 08:58:21 +0200
-@@ -92,6 +92,11 @@
- #define WCHAR_TYPE "short unsigned int"
- #define WCHAR_TYPE_SIZE 16
- 
-+/* gcc defaults to 96 bits on i386, which is bad on interix, as VC++
-+ * seems to default to 64 bit. since the interix libc is built with VC++,
-+ * we need to do the same thing here. */
-+#define LONG_DOUBLE_TYPE_SIZE 64
-+
- /* Our strategy for finding global constructors is a bit different, although
-    not a lot.  */
- #define DO_GLOBAL_CTORS_BODY						\

diff --git a/sys-devel/gcc/files/gcc-4.2.4-interix-x64-support.patch b/sys-devel/gcc/files/gcc-4.2.4-interix-x64-support.patch
deleted file mode 100644
index 6612e71b72..0000000000
--- a/sys-devel/gcc/files/gcc-4.2.4-interix-x64-support.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru gcc-4.2.4.orig/gcc/config/interix.h gcc-4.2.4/gcc/config/interix.h
---- gcc-4.2.4.orig/gcc/config/interix.h	2009-09-23 10:19:11 +0200
-+++ gcc-4.2.4/gcc/config/interix.h	2009-09-23 10:09:59 +0200
-@@ -57,6 +57,12 @@
- #undef STARTFILE_SPEC
- #define STARTFILE_SPEC  \
-   "%{!shared:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}} %{shared:crti%O%s}"
-+ 
-+/* include /usr/lib/x86 in the search by default, so that the x86 compiled GCC
-+ * is able to run on a x64 SUA installation. */
-+#undef STARTFILE_PREFIX_SPEC
-+#define STARTFILE_PREFIX_SPEC \
-+	"/usr/lib/x86/ /usr/lib/ /lib/"
- 
- #undef WORD_SWITCH_TAKES_ARG
- #define WORD_SWITCH_TAKES_ARG(STR)					\

diff --git a/sys-devel/gcc/files/gcc-4.4.1-interix-avoid-bs.patch b/sys-devel/gcc/files/gcc-4.4.1-interix-avoid-bs.patch
deleted file mode 100644
index 8b242ace41..0000000000
--- a/sys-devel/gcc/files/gcc-4.4.1-interix-avoid-bs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ru gcc-4.4.1.orig/configure gcc-4.4.1/configure
---- gcc-4.4.1.orig/configure	2009-09-24 11:16:58 +0200
-+++ gcc-4.4.1/configure	2009-09-24 13:39:50 +0200
-@@ -2849,6 +2849,9 @@
-     host_makefile_frag="config/mh-mingw"
-     ;;
-   *-interix*)
-+	# We definitely don't want cc on interix, since this uses the native
-+	# Visual Studio tools, and doesn't work if those are missing.
-+	tentative_cc=gcc
-     host_makefile_frag="config/mh-interix"
-     ;;
-   vax-*-ultrix2*)
-@@ -5733,6 +5736,9 @@
-   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
-     target_makefile_frag="config/mt-gnu"
-     ;;
-+  *-*-interix*)
-+    target_makefile_frag="config/mt-interix"
-+    ;;
-   *-*-aix4.[3456789]* | *-*-aix[56789].*)
-     # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm
-     # commands to handle both 32-bit and 64-bit objects.  These flags are
-diff -ru gcc-4.4.1.orig/libmudflap/configure gcc-4.4.1/libmudflap/configure
---- gcc-4.4.1.orig/libmudflap/configure	2009-09-24 11:18:59 +0200
-+++ gcc-4.4.1/libmudflap/configure	2009-09-24 13:41:15 +0200
-@@ -12669,7 +12669,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--for name in _start __start unknown; do
-+for name in _start __start _mainCRTStartup unknown; do
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-diff -ru gcc-4.4.1.orig/libstdc++-v3/configure gcc-4.4.1/libstdc++-v3/configure
---- gcc-4.4.1.orig/libstdc++-v3/configure	2009-09-24 11:19:00 +0200
-+++ gcc-4.4.1/libstdc++-v3/configure	2009-09-24 13:43:08 +0200
-@@ -15034,6 +15034,12 @@
-   fi
-   if test x"$ac_fdsections" = x"yes"; then
-     SECTION_FLAGS='-ffunction-sections -fdata-sections'
-+
-+	# don't user function sections on interix - the resulting lib is not usable
-+	# for some reason...
-+	case "${target}" in
-+	*-*-interix*)  SECTION_FLAGS='' ;;
-+	esac
-   fi
-   echo "$as_me:$LINENO: result: $ac_fdsections" >&5
- echo "${ECHO_T}$ac_fdsections" >&6

diff --git a/sys-devel/gcc/files/gcc-4.4.1-interix.patch b/sys-devel/gcc/files/gcc-4.4.1-interix.patch
deleted file mode 100644
index 1caab112c0..0000000000
--- a/sys-devel/gcc/files/gcc-4.4.1-interix.patch
+++ /dev/null
@@ -1,350 +0,0 @@
-diff -ruN gcc-4.4.1.orig/config/mh-interix gcc-4.4.1/config/mh-interix
---- gcc-4.4.1.orig/config/mh-interix	2009-09-25 08:54:49 +0200
-+++ gcc-4.4.1/config/mh-interix	2009-09-24 17:11:12 +0200
-@@ -1,7 +1,7 @@
--# The shell may not be in /bin. 
--SHELL = sh
-+BOOT_CFLAGS       = -g -O2 -D_ALL_SOURCE -D_REENTRANT
-+CFLAGS_FOR_BUILD  = -g -O2 -D_ALL_SOURCE -D_REENTRANT
-+CFLAGS            = -g -O2 -D_ALL_SOURCE -D_REENTRANT
- 
- # We also need to override LIBGCC2_DEBUG_CFLAGS so libgcc2 will be
- # built without debugging information
--
- LIBGCC2_DEBUG_CFLAGS=
-diff -ruN gcc-4.4.1.orig/config/mt-interix gcc-4.4.1/config/mt-interix
---- gcc-4.4.1.orig/config/mt-interix	1970-01-01 01:00:00 +0100
-+++ gcc-4.4.1/config/mt-interix	2009-09-24 17:11:12 +0200
-@@ -0,0 +1 @@
-+CPPFLAGS_FOR_TARGET = -D_ALL_SOURCE -D_REENTRANT
-diff -ruN gcc-4.4.1.orig/configure.ac gcc-4.4.1/configure.ac
---- gcc-4.4.1.orig/configure.ac	2009-09-25 08:54:49 +0200
-+++ gcc-4.4.1/configure.ac	2009-09-24 17:11:12 +0200
-@@ -1058,6 +1058,9 @@
-     host_makefile_frag="config/mh-mingw"
-     ;;
-   *-interix*)
-+	# We definitely don't want cc on interix, since this uses the native
-+	# Visual Studio tools, and doesn't work if those are missing.
-+	tentative_cc=gcc
-     host_makefile_frag="config/mh-interix"
-     ;;
-   vax-*-ultrix2*)
-@@ -2043,6 +2046,9 @@
-   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
-     target_makefile_frag="config/mt-gnu"
-     ;;
-+  *-*-interix*)
-+    target_makefile_frag="config/mt-interix"
-+    ;;
-   *-*-aix4.[[3456789]]* | *-*-aix[[56789]].*)
-     # nm and ar from AIX 4.3 and above require -X32_64 flag to all ar and nm 
-     # commands to handle both 32-bit and 64-bit objects.  These flags are
-diff -ruN gcc-4.4.1.orig/gcc/config/i386/i386-interix.h gcc-4.4.1/gcc/config/i386/i386-interix.h
---- gcc-4.4.1.orig/gcc/config/i386/i386-interix.h	2009-09-25 08:54:49 +0200
-+++ gcc-4.4.1/gcc/config/i386/i386-interix.h	2009-09-24 17:11:12 +0200
-@@ -43,7 +43,7 @@
-     MASK_ALIGN_DOUBLE | MASK_MS_BITFIELD_LAYOUT)
- 
- #undef TARGET_CPU_DEFAULT
--#define TARGET_CPU_DEFAULT TARGET_CPU_DEFAULT_i486
-+#define TARGET_CPU_DEFAULT TARGET_CPU_DEFAULT_pentiumpro
- 
- #define WCHAR_TYPE_SIZE 16
- #define WCHAR_TYPE "short unsigned int"
-@@ -61,7 +61,8 @@
-     {									\
- 	builtin_define ("__INTERIX");					\
- 	builtin_define ("__OPENNT");					\
--	builtin_define ("_M_IX86=300");					\
-+	builtin_define ("_ALL_SOURCE");					\
-+	builtin_define ("_M_IX86=600");					\
- 	builtin_define ("_X86_=1");					\
- 	builtin_define ("__stdcall=__attribute__((__stdcall__))");	\
- 	builtin_define ("__cdecl=__attribute__((__cdecl__))");		\
-@@ -81,14 +82,9 @@
-   while (0)
- 
- #undef CPP_SPEC
--/* Write out the correct language type definition for the header files.  
--   Unless we have assembler language, write out the symbols for C.
--   mieee is an Alpha specific variant.  Cross pollination a bad idea.
--   */
--#define CPP_SPEC "-remap %{posix:-D_POSIX_SOURCE} \
---isystem %$INTERIX_ROOT/usr/include"
-+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}"
- 
--#define TARGET_VERSION fprintf (stderr, " (i386 Interix)");
-+#define TARGET_VERSION fprintf (stderr, " (i686 Interix)");
- 
- /* The global __fltused is necessary to cause the printf/scanf routines
-    for outputting/inputting floating point numbers to be loaded.  Since this
-@@ -245,6 +241,11 @@
-    And if the user tries to set the flag for objc, give an error
-    so he has some clue.  */
- 
-+/* Disable the pic flag if it has been enabled, since on interix, all
-+ * code is PIC by default. Older versions of this code emitted a warning,
-+ * but there -fPIC is passed quite often to GCC by default, so don't spit
-+ * around, and pollute output. */
-+
- #undef  SUBTARGET_OVERRIDE_OPTIONS
- #define SUBTARGET_OVERRIDE_OPTIONS					\
- do {									\
-@@ -257,6 +258,10 @@
- 	}								\
-       target_flags &= ~MASK_MS_BITFIELD_LAYOUT;				\
-     }									\
-+    if(flag_pic)							\
-+    {									\
-+      flag_pic = 0;							\
-+    }									\
- } while (0)
- 
- #define EH_FRAME_IN_DATA_SECTION
-@@ -272,6 +277,17 @@
-    ld -r (specifically -rU).  */
- #define CTOR_LISTS_DEFINED_EXTERNALLY 1
- 
-+/* Max allowed section alignment specified by the PECOFF specs */
-+#undef MAX_OFILE_ALIGNMENT
-+#define MAX_OFILE_ALIGNMENT (8192 * 8)
-+
-+#undef BIGGEST_FIELD_ALIGNMENT
-+#define BIGGEST_FIELD_ALIGNMENT 64
-+
-+#undef PCC_BITFIELD_TYPE_MATTERS
-+#define PCC_BITFIELD_TYPE_MATTERS 1
-+#define GROUP_BITFIELDS_BY_ALIGN TYPE_NATIVE(rec)
-+
- #define SET_ASM_OP	"\t.set\t"
- /* Output a definition (implements alias) */
- #define ASM_OUTPUT_DEF(FILE,LABEL1,LABEL2)				\
-@@ -285,6 +301,28 @@
-     }									\
- while (0)
- 
-+#define ASM_WEAKEN_LABEL(FILE, NAME)					\
-+do									\
-+{									\
-+    fprintf(FILE, "/* .weak ");						\
-+    assemble_name (FILE, NAME);						\
-+    fprintf(FILE, " (not supported on interix) */\n");			\
-+} while (0)
-+
-+#define ASM_OUTPUT_DEF_FROM_DECLS(FILE, DECL, TARGET)			\
-+do									\
-+{									\
-+    if(DECL_WEAK(DECL)) {						\
-+	fprintf(FILE, "\t.alias\t");					\
-+    } else {								\
-+	fprintf(FILE, SET_ASM_OP);					\
-+    }									\
-+    assemble_name(FILE, IDENTIFIER_POINTER(DECL_ASSEMBLER_NAME(DECL)));	\
-+    fprintf(FILE, ", ");						\
-+    assemble_name(FILE, IDENTIFIER_POINTER(TARGET));			\
-+    fprintf(FILE, "\n");						\
-+} while (0)
-+
- #define HOST_PTR_AS_INT unsigned long
- 
- #define PCC_BITFIELD_TYPE_MATTERS 1
-@@ -329,11 +367,6 @@
- #undef  TARGET_STRIP_NAME_ENCODING
- #define TARGET_STRIP_NAME_ENCODING  i386_pe_strip_name_encoding_full
- 
--#if 0	
--/* Turn this back on when the linker is updated to handle grouped
--   .data$ sections correctly. See corresponding note in i386/interix.c. 
--   MK.  */
--
- /* Interix uses explicit import from shared libraries.  */
- #define MULTIPLE_SYMBOL_SPACES 1
- 
-@@ -342,7 +375,6 @@
- #define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
- 
- #define SUPPORTS_ONE_ONLY 1
--#endif /* 0 */
- 
- /* Switch into a generic section.  */
- #define TARGET_ASM_NAMED_SECTION  default_pe_asm_named_section
-@@ -359,4 +391,4 @@
- 
- #define SUBTARGET_RETURN_IN_MEMORY(TYPE, FNTYPE) \
- 	(TYPE_MODE (TYPE) == BLKmode \
--	 || (AGGREGATE_TYPE_P (TYPE) && int_size_in_bytes (TYPE) > 8 ))
-\ No newline at end of file
-+	 || (AGGREGATE_TYPE_P (TYPE) && int_size_in_bytes (TYPE) > 8 ))
-diff -ruN gcc-4.4.1.orig/gcc/config/i386/t-interix gcc-4.4.1/gcc/config/i386/t-interix
---- gcc-4.4.1.orig/gcc/config/i386/t-interix	2009-09-25 08:54:49 +0200
-+++ gcc-4.4.1/gcc/config/i386/t-interix	2009-09-24 17:11:12 +0200
-@@ -5,3 +5,13 @@
-   $(TM_H) $(RTL_H) $(REGS_H) hard-reg-set.h output.h $(TREE_H) flags.h \
-   $(TM_P_H) toplev.h $(HASHTAB_H) $(GGC_H)
- 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/i386/winnt.c
-+
-+winnt-cxx.o: $(srcdir)/config/i386/winnt-cxx.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-+  $(TM_H) $(RTL_H) $(REGS_H) hard-reg-set.h output.h $(TREE_H) flags.h \
-+  $(TM_P_H) toplev.h $(HASHTAB_H) $(GGC_H)
-+	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/i386/winnt-cxx.c
-+
-+winnt-stubs.o: $(srcdir)/config/i386/winnt-stubs.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
-+  $(TM_H) $(RTL_H) $(REGS_H) hard-reg-set.h output.h $(TREE_H) flags.h \
-+  $(TM_P_H) toplev.h $(HASHTAB_H) $(GGC_H)
-+	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/i386/winnt-stubs.c
-diff -ruN gcc-4.4.1.orig/gcc/config/interix.h gcc-4.4.1/gcc/config/interix.h
---- gcc-4.4.1.orig/gcc/config/interix.h	2009-09-25 08:54:49 +0200
-+++ gcc-4.4.1/gcc/config/interix.h	2009-09-24 17:11:12 +0200
-@@ -25,19 +25,13 @@
- /* POSIX/Uni-thread only for now.  Look at the winnt version
- for windows/multi thread */
- 
--/* We need multiple -lc -lcpsx because they mutually refer;
--   that should go away someday */
--
- #undef LIB_SPEC
- #define LIB_SPEC "\
-- %{!shared:%{!dynamic:-lc -lcpsx -lc -lcpsx %$INTERIX_ROOT/usr/lib/psxdll.a \
-- %$INTERIX_ROOT/usr/lib/psxdll2.a \
-+ %{!shared:%{!dynamic:-lc -lpsxdll \
-  }} \
-- %{!G:%{!dynamic:-lc -lcpsx -lc -lcpsx %$INTERIX_ROOT/usr/lib/psxdll.a \
-- %$INTERIX_ROOT/usr/lib/psxdll2.a \
-+ %{!G:%{!dynamic:-lc -lpsxdll \
-  }} \
-- %{dynamic:-lc %$INTERIX_ROOT/usr/lib/psxdll.a \
-- %$INTERIX_ROOT/usr/lib/psxdll2.a \
-+ %{dynamic:-lc -lpsxdll \
-  } \
-  %{v}"
- 
-@@ -58,6 +52,12 @@
- #define STARTFILE_SPEC  \
-   "%{!shared:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}}} %{shared:crti%O%s}"
- 
-+/* also search /usr/lib/x86/ for libraries (and before /usr/lib/, etc.), so
-+ * that the x64 versiosn of SUA work with the x86 targeting GCC */
-+#undef STARTFILE_PREFIX_SPEC
-+#define STARTFILE_PREFIX_SPEC \
-+  "/usr/lib/x86/ /usr/lib/ /lib/"
-+
- #undef WORD_SWITCH_TAKES_ARG
- #define WORD_SWITCH_TAKES_ARG(STR)					\
-  ((DEFAULT_WORD_SWITCH_TAKES_ARG (STR)					\
-diff -ruN gcc-4.4.1.orig/gcc/config.gcc gcc-4.4.1/gcc/config.gcc
---- gcc-4.4.1.orig/gcc/config.gcc	2009-09-25 08:54:49 +0200
-+++ gcc-4.4.1/gcc/config.gcc	2009-09-24 17:11:13 +0200
-@@ -1301,10 +1301,11 @@
- 			;;
- 	esac
- 	;;
--i[34567]86-*-interix3*)
--	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h i386/i386-interix3.h interix.h interix3.h"
-+i[34567]86-*-interix*)
-+	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/i386-interix.h interix.h"
- 	tmake_file="${tmake_file} i386/t-interix"
--	extra_objs=winnt.o
-+	extra_objs="winnt.o winnt-stubs.o"
-+	cxx_target_objs="winnt-cxx.o"
- 	target_gtfiles="\$(srcdir)/config/i386/winnt.c"
- 	if test x$enable_threads = xyes ; then
- 		thread_file='posix'
-diff -ruN gcc-4.4.1.orig/gcc/cp/Make-lang.in gcc-4.4.1/gcc/cp/Make-lang.in
---- gcc-4.4.1.orig/gcc/cp/Make-lang.in	2009-09-25 08:15:13 +0200
-+++ gcc-4.4.1/gcc/cp/Make-lang.in	2009-09-25 09:13:33 +0200
-@@ -73,7 +73,7 @@
- CXX_C_OBJS = attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o \
- 	c-dump.o $(CXX_TARGET_OBJS) c-pretty-print.o c-opts.o c-pch.o \
- 	incpath.o cppdefault.o c-ppoutput.o c-cppbuiltin.o prefix.o \
--	c-gimplify.o c-omp.o tree-inline.o
-+	c-gimplify.o c-omp.o tree-inline.o $(C_TARGET_OBJS)
- 
- # Language-specific object files for C++ and Objective C++.
- CXX_AND_OBJCXX_OBJS = cp/call.o cp/decl.o cp/expr.o cp/pt.o cp/typeck2.o \
-diff -ruN gcc-4.4.1.orig/gcc/ginclude/stddef.h gcc-4.4.1/gcc/ginclude/stddef.h
---- gcc-4.4.1.orig/gcc/ginclude/stddef.h	2009-09-25 08:54:49 +0200
-+++ gcc-4.4.1/gcc/ginclude/stddef.h	2009-09-24 17:11:12 +0200
-@@ -135,6 +135,7 @@
- #ifndef _BSD_PTRDIFF_T_
- #ifndef ___int_ptrdiff_t_h
- #ifndef _GCC_PTRDIFF_T
-+#ifndef _PTRDIFF_T_DEFINED
- #define _PTRDIFF_T
- #define _T_PTRDIFF_
- #define _T_PTRDIFF
-@@ -143,10 +144,12 @@
- #define _BSD_PTRDIFF_T_
- #define ___int_ptrdiff_t_h
- #define _GCC_PTRDIFF_T
-+#define _PTRDIFF_T_DEFINED
- #ifndef __PTRDIFF_TYPE__
- #define __PTRDIFF_TYPE__ long int
- #endif
- typedef __PTRDIFF_TYPE__ ptrdiff_t;
-+#endif /* _PTRDIFF_T_DEFINED */
- #endif /* _GCC_PTRDIFF_T */
- #endif /* ___int_ptrdiff_t_h */
- #endif /* _BSD_PTRDIFF_T_ */
-diff -ruN gcc-4.4.1.orig/libgcc/config.host gcc-4.4.1/libgcc/config.host
---- gcc-4.4.1.orig/libgcc/config.host	2009-09-25 08:54:49 +0200
-+++ gcc-4.4.1/libgcc/config.host	2009-09-24 17:11:12 +0200
-@@ -339,7 +339,7 @@
- 	;;
- x86_64-*-mingw*)
- 	;;
--i[34567]86-*-interix3*)
-+i[34567]86-*-interix*)
- 	;;
- ia64*-*-elf*)
- 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
-diff -ruN gcc-4.4.1.orig/libmudflap/configure.ac gcc-4.4.1/libmudflap/configure.ac
---- gcc-4.4.1.orig/libmudflap/configure.ac	2009-09-25 08:54:49 +0200
-+++ gcc-4.4.1/libmudflap/configure.ac	2009-09-24 17:11:12 +0200
-@@ -245,7 +245,7 @@
- # Check for the name of the symbol used for the entry point.
- AC_CACHE_CHECK([for the name of the symbol used for the entry point],
-   [mudflap_cv_entry_point], [
--for name in _start __start unknown; do
-+for name in _start __start _mainCRTStartup unknown; do
-   AC_LINK_IFELSE([AC_LANG_PROGRAM([extern char $name@<:@@:>@;], [$name@<:@0@:>@ = 0;])],
- 		 [break])
- done
-diff -ruN gcc-4.4.1.orig/libstdc++-v3/acinclude.m4 gcc-4.4.1/libstdc++-v3/acinclude.m4
---- gcc-4.4.1.orig/libstdc++-v3/acinclude.m4	2009-09-25 08:54:49 +0200
-+++ gcc-4.4.1/libstdc++-v3/acinclude.m4	2009-09-24 17:11:12 +0200
-@@ -179,6 +179,12 @@
-   fi
-   if test x"$ac_fdsections" = x"yes"; then
-     SECTION_FLAGS='-ffunction-sections -fdata-sections'
-+
-+    # don't user function sections on interix - the resulting lib is not usable
-+    # for some reason...
-+    case "${target}" in
-+    *-*-interix*)	SECTION_FLAGS='' ;;
-+    esac
-   fi
-   AC_MSG_RESULT($ac_fdsections)
- 
-diff -ruN gcc-4.4.1.orig/libstdc++-v3/src/math_stubs_long_double.cc gcc-4.4.1/libstdc++-v3/src/math_stubs_long_double.cc
---- gcc-4.4.1.orig/libstdc++-v3/src/math_stubs_long_double.cc	2009-09-25 08:54:49 +0200
-+++ gcc-4.4.1/libstdc++-v3/src/math_stubs_long_double.cc	2009-09-24 17:11:12 +0200
-@@ -28,6 +28,18 @@
- // we use the following crude approximations. We keep saying that we'll do
- // better later, but never do.
- 
-+#ifdef fabsl
-+#undef fabsl
-+#endif
-+
-+#ifdef ceill
-+#undef ceill
-+#endif
-+
-+#ifdef floorl
-+#undef floorl
-+#endif
-+
- extern "C" 
- {
- #ifndef _GLIBCXX_HAVE_FABSL

diff --git a/sys-devel/gcc/files/gcc-4.8-aix-extref.patch b/sys-devel/gcc/files/gcc-4.8-aix-extref.patch
deleted file mode 100644
index eef77389e5..0000000000
--- a/sys-devel/gcc/files/gcc-4.8-aix-extref.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-commit 1079e475f284f9abce455f02065a7a3bac9a9b90
-Author: dje <dje@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date:   Mon Feb 16 15:33:09 2015 +0000
-
-    2015-02-16  Michael Haubenwallner  <michael.haubenwallner@××××××××××××.com>
-                David Edelsohn  <dje.gcc@×××××.com>
-    
-            PR target/65058
-            * config/rs6000/rs6000.c (rs6000_output_symbol_ref): Append storage
-            mapping class to external variable or function reference.
-            * config/rs6000/xcoff.h (ASM_OUTPUT_EXTERNAL): Do not append storage
-            mapping class.
-    
-#    2015-02-16  David Eelsohn  <dje.gcc@×××××.com>
-    
-            PR target/53348
-            * config/rs6000/rs6000.c (rs6000_declare_alias): Only use
-            ASM_WEAKEN_DECL if defined.
-    
-    
-    
-    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220737 138bc75d-0d04-0410-961f-82ee72b054a4
-
-#diff --git a/gcc/ChangeLog b/gcc/ChangeLog
-#index e049c99..04ac119 100644
-#--- a/gcc/ChangeLog
-#+++ b/gcc/ChangeLog
-#@@ -1,3 +1,18 @@
-[phone]  Michael Haubenwallner  <michael.haubenwallner@××××××××××××.com>
-+	    David Edelsohn  <dje.gcc@×××××.com>
-+
-+	PR target/65058
-+	* config/rs6000/rs6000.c (rs6000_output_symbol_ref): Append storage
-+	mapping class to external variable or function reference.
-+	* config/rs6000/xcoff.h (ASM_OUTPUT_EXTERNAL): Do not append storage
-+	mapping class.
-+
-[phone]  David Eelsohn  <dje.gcc@×××××.com>
-+
-+	PR target/53348
-+	* config/rs6000/rs6000.c (rs6000_declare_alias): Only use
-+	ASM_WEAKEN_DECL if defined.
-+
- 2015-02-16  Richard Biener  <rguenther@××××.de>
- 
- 	PR lto/65015
-diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
-index 86ef0fe..e482547 100644
---- a/gcc/config/rs6000/rs6000.c
-+++ b/gcc/config/rs6000/rs6000.c
-@@ -26030,6 +26030,20 @@ rs6000_output_symbol_ref (FILE *file, rtx x)
-      section.  */
-   const char *name = XSTR (x, 0);
- 
-+  tree decl = SYMBOL_REF_DECL (x);
-+  if (decl /* sync condition with assemble_external () */
-+      && DECL_P (decl) && DECL_EXTERNAL (decl) && TREE_PUBLIC (decl)
-+      && (TREE_CODE (decl) == VAR_DECL
-+	  || TREE_CODE (decl) == FUNCTION_DECL)
-+      && name[strlen (name) - 1] != ']')
-+    {
-+      name = concat (name,
-+		     (TREE_CODE (decl) == FUNCTION_DECL
-+		      ? "[DS]" : "[UA]"),
-+		     NULL);
-+      XSTR (x, 0) = name;
-+    }
-+
-   if (VTABLE_NAME_P (name))
-     {
-       RS6000_OUTPUT_BASENAME (file, name);
-#@@ -30081,8 +30095,10 @@ rs6000_declare_alias (struct symtab_node *n, void *d)
- 	  RS6000_OUTPUT_BASENAME (data->file, buffer);
- 	  putc ('\n', data->file);
- 	}
-+#ifdef ASM_WEAKEN_DECL
-       else if (DECL_WEAK (n->decl) && !data->function_descriptor)
- 	ASM_WEAKEN_DECL (data->file, n->decl, name, NULL);
-+#endif
-     }
-   else
-     {
-diff --git a/gcc/config/rs6000/xcoff.h b/gcc/config/rs6000/xcoff.h
-index 6dc1207..db024fc 100644
---- a/gcc/config/rs6000/xcoff.h
-+++ b/gcc/config/rs6000/xcoff.h
-@@ -170,15 +170,6 @@
-       putc ('\n', FILE);						\
-       fprintf(FILE, "\t.rename .%s,\".%s\"\n", buffer, NAME);		\
-     }									\
--  if ((TREE_CODE (DECL) == VAR_DECL					\
--       || TREE_CODE (DECL) == FUNCTION_DECL)				\
--      && (NAME)[strlen (NAME) - 1] != ']')				\
--    {									\
--      XSTR (_symref, 0) = concat (XSTR (_symref, 0),			\
--				  (TREE_CODE (DECL) == FUNCTION_DECL	\
--				   ? "[DS]" : "[RW]"),			\
--				  NULL);				\
--    }									\
- }
- 
- /* This is how to output a reference to a user-level label named NAME.

diff --git a/sys-devel/gcc/files/gcc-4.8.2-linux-x86-on-amd64.patch b/sys-devel/gcc/files/gcc-4.8.2-linux-x86-on-amd64.patch
deleted file mode 100644
index 7d834d0bf1..0000000000
--- a/sys-devel/gcc/files/gcc-4.8.2-linux-x86-on-amd64.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- gcc/config.gcc.orig	2009-04-17 13:58:41.000000000 +0200
-+++ gcc/config.gcc	2009-09-22 15:38:53.614811935 +0200
-@@ -1304,6 +1304,7 @@
- 			esac
- 		else
- 			tm_file="${tm_file} i386/gnu-user-common.h i386/gnu-user.h i386/linux-common.h i386/linux.h"
-+			tmake_file="${tmake_file} i386/t-linux32"
- 		fi
- 		;;
- 	i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} i386/linux.h knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
---- gcc/config/i386/gnu-user.h.orig	2009-05-21 15:21:30.000000000 +0200
-+++ gcc/config/i386/gnu-user.h	2009-09-22 15:33:39.158050728 +0200
-@@ -114,6 +114,8 @@
-    %{mpc80:crtprec80.o%s} \
-    %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
- 
-+#define MULTILIB_DEFAULTS { "m32" }
-+
- /* A C statement (sans semicolon) to output to the stdio stream
-    FILE the assembler definition of uninitialized global DECL named
-    NAME whose size is SIZE bytes and alignment is ALIGN bytes.
---- /dev/null	2009-09-10 15:59:29.820003140 +0200
-+++ gcc/config/i386/t-linux32	2009-09-16 11:02:34.118502434 +0200
-@@ -0,0 +1,10 @@
-+# On Debian, Ubuntu and other derivative distributions, the 32bit libraries
-+# are found in /lib32 and /usr/lib32, /lib64 and /usr/lib64 are symlinks to
-+# /lib and /usr/lib, while other distributions install libraries into /lib64
-+# and /usr/lib64.  The LSB does not enforce the use of /lib64 and /usr/lib64,
-+# it doesn't tell anything about the 32bit libraries on those systems.  Set
-+# MULTILIB_OSDIRNAMES according to what is found on the target.
-+
-+MULTILIB_OPTIONS = m32
-+MULTILIB_DIRNAMES = .
-+MULTILIB_OSDIRNAMES = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,)

diff --git a/sys-devel/gcc/files/gcc-4.8.4-aix-pthread-specs.patch b/sys-devel/gcc/files/gcc-4.8.4-aix-pthread-specs.patch
deleted file mode 100644
index b64224a424..0000000000
--- a/sys-devel/gcc/files/gcc-4.8.4-aix-pthread-specs.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5c8068b3cac9a04e8ddf942dcd8cef6202b2ed22 Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <michael.haubenwallner@××××××××××××.com>
-Date: Tue, 3 Feb 2015 18:52:35 +0100
-Subject: [PATCH 4/4] Let --with-specs=-pthread work even for the shared
- libgcc.
-
----
- libgcc/config/rs6000/t-slibgcc-aix | 14 ++++----------
- 1 file changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/libgcc/config/rs6000/t-slibgcc-aix b/libgcc/config/rs6000/t-slibgcc-aix
-index f1f4748..ae78474 100644
---- a/libgcc/config/rs6000/t-slibgcc-aix
-+++ b/libgcc/config/rs6000/t-slibgcc-aix
-@@ -36,12 +36,9 @@ SHLIB_SOVERSION = 1
- SHLIB_SONAME = @shlib_base_name@.so.$(SHLIB_SOVERSION)
- SHLIB_LINK = \
- 	if test svr4 != $(with_aix_soname) ; then \
--	  $(CC) $(LIBGCC2_CFLAGS) -shared -Wl,-bnortl -nodefaultlibs \
-+	  $(CC) $(LIBGCC2_CFLAGS) -shared -Wl,-bnortl -static-libgcc \
- 	  -Wl,-bE:@shlib_map_file@ -o @multilib_dir@/shr.o \
--	  @multilib_flags@ @shlib_objs@ -lc \
--	  `case @multilib_dir@ in \
--	  *pthread*) echo -L$(TARGET_SYSTEM_ROOT)/usr/lib/threads -lpthreads -lc_r $(TARGET_SYSTEM_ROOT)/usr/lib/libc.a ;; \
--	  *) echo -lc ;; esac` ; \
-+	  @multilib_flags@ @shlib_objs@ ; \
- 	  rm -f @multilib_dir@/tmp-@shlib_base_name@.a ; \
- 	  $(AR_CREATE_FOR_TARGET) @multilib_dir@/tmp-@shlib_base_name@.a \
- 	    @multilib_dir@/shr.o ; \
-@@ -51,12 +48,9 @@ SHLIB_LINK = \
- 	fi ; \
- 	if test aix != $(with_aix_soname) ; then \
- 	  case @multilib_dir@ in *64*) shr='shr_64' ;; *) shr='shr' ;; esac ; \
--	  $(CC) $(LIBGCC2_CFLAGS) -shared -Wl,-G -nodefaultlibs \
-+	  $(CC) $(LIBGCC2_CFLAGS) -shared -Wl,-G -static-libgcc \
- 	  -Wl,-bE:@shlib_map_file@ -o @multilib_dir@/$$shr.o \
--	  @multilib_flags@ @shlib_objs@ -lc \
--	  `case @multilib_dir@ in \
--	  *pthread*) echo -L$(TARGET_SYSTEM_ROOT)/usr/lib/threads -lpthreads -lc_r $(TARGET_SYSTEM_ROOT)/usr/lib/libc.a ;; \
--	  *) echo -lc ;; esac` ; \
-+	  @multilib_flags@ @shlib_objs@ ; \
- 	  $(STRIP_FOR_TARGET) -X32_64 -e @multilib_dir@/$$shr.o ; \
- 	  { echo "\#! $(SHLIB_SONAME)($$shr.o)" ; \
- 	    case @multilib_dir@ in *64*) echo '\# 64' ;; *) echo '\# 32' ;; esac ; \
--- 
-2.0.5
-

diff --git a/sys-devel/gcc/files/gcc-4.8.4-aix-soname-libgcc.patch.xz b/sys-devel/gcc/files/gcc-4.8.4-aix-soname-libgcc.patch.xz
deleted file mode 100644
index a93356a4af..0000000000
Binary files a/sys-devel/gcc/files/gcc-4.8.4-aix-soname-libgcc.patch.xz and /dev/null differ

diff --git a/sys-devel/gcc/files/gcc-4.8.4-aix-soname-libtool.patch.xz b/sys-devel/gcc/files/gcc-4.8.4-aix-soname-libtool.patch.xz
deleted file mode 100644
index 9ca8c5cdb8..0000000000
Binary files a/sys-devel/gcc/files/gcc-4.8.4-aix-soname-libtool.patch.xz and /dev/null differ

diff --git a/sys-devel/gcc/files/gcc-4.8.4-aix-soname-nm-weak.patch b/sys-devel/gcc/files/gcc-4.8.4-aix-soname-nm-weak.patch
deleted file mode 100644
index 04f1e2838b..0000000000
--- a/sys-devel/gcc/files/gcc-4.8.4-aix-soname-nm-weak.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0ea81204518de942e047a51033dd77461d9f2f06 Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <michael.haubenwallner@××××××××××××.com>
-Date: Thu, 5 Feb 2015 15:22:24 +0100
-Subject: [PATCH] nm for AIX: avoid -B flag when there is -P
-
----
- gcc/exec-tool.in | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/gcc/exec-tool.in b/gcc/exec-tool.in
-index 6722ce5..5145ba7 100644
---- a/gcc/exec-tool.in
-+++ b/gcc/exec-tool.in
-@@ -49,6 +49,23 @@ case "$invoked" in
-     ;;
-   nm)
-     original=$ORIGINAL_NM_FOR_TARGET
-+    # AIX-nm needs -B for BSD-style, but properly reports weak symbols with
-+    # -P only (for --with-aix-soname=svr4). Both are mutually exclusive.
-+    for arg in ${1+"$@"}; do
-+      case $arg in
-+	-*P*)
-+	  original=
-+	  for arg in $ORIGINAL_NM_FOR_TARGET; do
-+	    case $arg in
-+	      -*B*) continue ;; # skip -B
-+	    esac
-+	    original="$original${original:+ }$arg"
-+	  done
-+	  break ;;
-+	-*) ;;
-+	*) break ;; # no more switches
-+      esac
-+    done
-     prog=nm-new$exeext
-     dir=binutils
-     ;;
--- 
-2.0.5
-

diff --git a/sys-devel/gcc/files/gcc-4.8.4-aix-soname-regen.patch.xz b/sys-devel/gcc/files/gcc-4.8.4-aix-soname-regen.patch.xz
deleted file mode 100644
index 53916f49cd..0000000000
Binary files a/sys-devel/gcc/files/gcc-4.8.4-aix-soname-regen.patch.xz and /dev/null differ

diff --git a/sys-devel/gcc/files/gcc-4.8.4-lowmem-build.patch b/sys-devel/gcc/files/gcc-4.8.4-lowmem-build.patch
deleted file mode 100644
index 5b398ebd77..0000000000
--- a/sys-devel/gcc/files/gcc-4.8.4-lowmem-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index de1f3b6..25f3587 100644
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -1149,6 +1149,19 @@ C_COMMON_OBJS = c-family/c-common.o c-family/c-cppbuiltin.o c-family/c-dump.o \
- # We put the insn-*.o files first so that a parallel make will build
- # them sooner, because they are large and otherwise tend to be the
- # last objects to finish building.
-+# Better do not build them in parallel at all to avoid exhausting memory.
-+insn-attrtab.o: insn-automata.o
-+insn-automata.o: insn-dfatab.o
-+insn-dfatab.o: insn-emit.o
-+insn-emit.o: insn-extract.o
-+insn-extract.o: insn-latencytab.o
-+insn-latencytab.o: insn-modes.o
-+insn-modes.o: insn-opinit.o
-+insn-opinit.o: insn-output.o
-+insn-output.o: insn-peep.o
-+insn-peep.o: insn-preds.o
-+insn-preds.o: insn-recog.o
-+insn-recog.o: insn-enums.o
- OBJS = \
- 	insn-attrtab.o \
- 	insn-automata.o \

diff --git a/sys-devel/gcc/files/gcc-5.3.0-libc_name_p.patch b/sys-devel/gcc/files/gcc-5.3.0-libc_name_p.patch
deleted file mode 100644
index e87076b904..0000000000
--- a/sys-devel/gcc/files/gcc-5.3.0-libc_name_p.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=233572
-
---- a/gcc/cp/Make-lang.in
-+++ b/gcc/cp/Make-lang.in
-@@ -111,7 +111,7 @@ else
- # deleting the $(srcdir)/cp/cfns.h file.
- $(srcdir)/cp/cfns.h:
- endif
--	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
-+	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \
- 		$(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h
- 
- #
---- a/gcc/cp/cfns.gperf
-+++ b/gcc/cp/cfns.gperf
-@@ -1,3 +1,5 @@ 
-+%language=C++
-+%define class-name libc_name
- %{
- /* Copyright (C) 2000-2015 Free Software Foundation, Inc.
- 
-@@ -16,14 +18,6 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- %}
- %%
- # The standard C library functions, for feeding to gperf; the result is used
---- a/gcc/cp/cfns.h
-+++ b/gcc/cp/cfns.h
-@@ -28,7 +28,7 @@ 
- #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@×××.org>."
- #endif
- 
--#line 1 "cfns.gperf"
-+#line 3 "cfns.gperf"
- 
- /* Copyright (C) 2000-2015 Free Software Foundation, Inc.
- 
-@@ -47,25 +47,18 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- /* maximum key range = 391, duplicates = 0 */
- 
--#ifdef __GNUC__
--__inline
--#else
--#ifdef __cplusplus
--inline
--#endif
--#endif
--static unsigned int
--hash (register const char *str, register unsigned int len)
-+class libc_name
-+{
-+private:
-+  static inline unsigned int hash (const char *str, unsigned int len);
-+public:
-+  static const char *libc_name_p (const char *str, unsigned int len);
-+};
-+
-+inline unsigned int
-+libc_name::hash (register const char *str, register unsigned int len)
- {
-   static const unsigned short asso_values[] =
-     {
-@@ -122,14 +115,8 @@ hash (register const char *str, register
-   return hval + asso_values[(unsigned char)str[len - 1]];
- }
- 
--#ifdef __GNUC__
--__inline
--#ifdef __GNUC_STDC_INLINE__
--__attribute__ ((__gnu_inline__))
--#endif
--#endif
- const char *
--libc_name_p (register const char *str, register unsigned int len)
-+libc_name::libc_name_p (register const char *str, register unsigned int len)
- {
-   enum
-     {
---- a/gcc/cp/except.c
-+++ b/gcc/cp/except.c
-@@ -1040,7 +1040,8 @@ nothrow_libfn_p (const_tree fn)
-      unless the system headers are playing rename tricks, and if
-      they are, we don't want to be confused by them.  */
-   id = DECL_NAME (fn);
--  return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id));
-+  return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id),
-+				   IDENTIFIER_LENGTH (id));
- }
- 
- /* Returns nonzero if an exception of type FROM will be caught by a

diff --git a/sys-devel/gcc/files/gcc-7.3.0-powerpc-darwin.patch b/sys-devel/gcc/files/gcc-7.3.0-powerpc-darwin.patch
deleted file mode 100644
index a636187f40..0000000000
--- a/sys-devel/gcc/files/gcc-7.3.0-powerpc-darwin.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=257501
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84113
-
---- branches/gcc-7-branch/gcc/config/rs6000/altivec.md	2018/02/08 18:39:43	257500
-+++ branches/gcc-7-branch/gcc/config/rs6000/altivec.md	2018/02/08 18:48:37	257501
-@@ -414,7 +414,6 @@
- (define_insn "*restore_world"
-  [(match_parallel 0 "restore_world_operation"
-                   [(return)
--		   (use (reg:SI LR_REGNO))
-                    (use (match_operand:SI 1 "call_operand" "s"))
-                    (clobber (match_operand:SI 2 "gpc_reg_operand" "=r"))])]
-  "TARGET_MACHO && (DEFAULT_ABI == ABI_DARWIN) && TARGET_32BIT"
---- branches/gcc-7-branch/gcc/config/rs6000/predicates.md	2018/02/08 18:39:43	257500
-+++ branches/gcc-7-branch/gcc/config/rs6000/predicates.md	2018/02/08 18:48:37	257501
-@@ -1468,13 +1468,12 @@
-   rtx elt;
-   int count = XVECLEN (op, 0);
- 
--  if (count != 59)
-+  if (count != 58)
-     return 0;
- 
-   index = 0;
-   if (GET_CODE (XVECEXP (op, 0, index++)) != RETURN
-       || GET_CODE (XVECEXP (op, 0, index++)) != USE
--      || GET_CODE (XVECEXP (op, 0, index++)) != USE
-       || GET_CODE (XVECEXP (op, 0, index++)) != CLOBBER)
-     return 0;
- 

diff --git a/sys-devel/gcc/files/gcj-4.3.1-iconvlink.patch b/sys-devel/gcc/files/gcj-4.3.1-iconvlink.patch
deleted file mode 100644
index 8d71cf6131..0000000000
--- a/sys-devel/gcc/files/gcj-4.3.1-iconvlink.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21206
-comment #7
-
-Not a real nice solution, but at least it works for our non-glibc
-platforms.
-
-
---- libjava/libgcj.spec.in
-+++ libjava/libgcj.spec.in
-@@ -7,6 +7,6 @@
- *startfile: @THREADSTARTFILESPEC@ %(startfileorig)
- 
- %rename lib liborig
--*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ -lm @LIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)
-+*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ -lm @LTLIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)
- 
- *jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@ @BACKTRACESPEC@ @IEEESPEC@ -fkeep-inline-functions

diff --git a/sys-devel/gcc/files/interix-3.5-stdint.h b/sys-devel/gcc/files/interix-3.5-stdint.h
deleted file mode 100644
index ee9289f69a..0000000000
--- a/sys-devel/gcc/files/interix-3.5-stdint.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 2002 Caldera International, Inc. All Rights Reserved.  
- *                                                                       
- *        THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF                 
- *                  Caldera International, Inc.                          
- *                                                                       
- *   The copyright notice above does not evidence any actual or intended 
- *   publication of such source code.                                    
- */
-
-#ifndef _STDINT_H
-#define _STDINT_H
-
-#ifndef _SIZE_T_DEFINED
-#if defined (lp64) || defined(_WIN64)
-typedef unsigned __int64    size_t;
-#else
-typedef unsigned int  size_t;
-#endif
-#define _SIZE_T_DEFINED
-#define _SIZE_T
-#endif/*_SIZE_T_DEFINED*/
-
-#ifndef _SSIZE_T_DEFINED
-#if (defined(lp64) || defined(_WIN64))
-typedef __int64    ssize_t;
-#else
-typedef int  ssize_t;
-#endif
-#define _SSIZE_T_DEFINED
-#endif/*_SIZE_T_DEFINED*/
-
-
-#ifndef _INT8_T
-#define _INT8_T
-typedef signed char	int8_t;
-#endif
-#ifndef _INT_LEAST8_T
-#define _INT_LEAST8_T
-typedef char	int_least8_t;
-#endif
-#ifndef _INT_FAST8_T
-#define _INT_FAST8_T
-typedef int	int_fast8_t;
-#endif
-
-#ifndef _UINT8_T
-#define _UINT8_T
-typedef unsigned char	uint8_t;
-#endif
-#ifndef _UINT_LEAST8_T
-#define _UINT_LEAST8_T
-typedef unsigned char	uint_least8_t;
-#endif
-#ifndef _UINT_FAST8_T
-#define _UINT_FAST8_T
-typedef unsigned int	uint_fast8_t;
-#endif
-
-#ifndef _INT16_T
-#define _INT16_T
-typedef short	int16_t;
-#endif
-#ifndef _INT_LEAST16_T
-#define _INT_LEAST16_T
-typedef short	int_least16_t;
-#endif
-#ifndef _INT_FAST16_T
-#define _INT_FAST16_T
-typedef int	int_fast16_t;
-#endif
-
-#ifndef _UINT16_T
-#define _UINT16_T
-typedef unsigned short	uint16_t;
-#endif
-#ifndef _UINT_LEAST16_T
-#define _UINT_LEAST16_T
-typedef unsigned short	uint_least16_t;
-#endif
-#ifndef _UINT_FAST16_T
-#define _UINT_FAST16_T
-typedef unsigned int	uint_fast16_t;
-#endif
-
-#ifndef _INT32_T
-#define _INT32_T
-typedef int	int32_t;
-#endif
-#ifndef _INT_LEAST32_T
-#define _INT_LEAST32_T
-typedef int	int_least32_t;
-#endif
-#ifndef _INT_FAST32_T
-#define _INT_FAST32_T
-typedef int	int_fast32_t;
-#endif
-
-#ifndef _UINT32_T
-#define _UINT32_T
-typedef unsigned int	uint32_t;
-#endif
-#ifndef _UINT_LEAST32_T
-#define _UINT_LEAST32_T
-typedef unsigned int	uint_least32_t;
-#endif
-#ifndef _UINT_FAST32_T
-#define _UINT_FAST32_T
-typedef unsigned int	uint_fast32_t;
-#endif
-
-#if defined(lp64)
-
-#ifndef _INT64_T
-#define _INT64_T
-typedef long	int64_t;
-#endif
-#ifndef _INT_LEAST64_T
-#define _INT_LEAST64_T
-typedef long	int_least64_t;
-#endif
-#ifndef _INT_FAST64_T
-#define _INT_FAST64_T
-typedef long	int_fast64_t;
-#endif
-
-#ifndef _UINT64_T
-#define _UINT64_T
-typedef unsigned long	uint64_t;
-#endif
-#ifndef _UINT_LEAST64_T
-#define _UINT_LEAST64_T
-typedef unsigned long	uint_least64_t;
-#endif
-#ifndef _UINT_FAST64_T
-#define _UINT_FAST64_T
-typedef unsigned long	uint_fast64_t;
-#endif
-
-#else /*!#model(lp64)*/
-
-#ifndef _INT64_T
-#define _INT64_T
-typedef long long	int64_t;
-#endif
-#ifndef _INT_LEAST64_T
-#define _INT_LEAST64_T
-typedef long long	int_least64_t;
-#endif
-#ifndef _INT_FAST64_T
-#define _INT_FAST64_T
-typedef long long	int_fast64_t;
-#endif
-
-#ifndef _UINT64_T
-#define _UINT64_T
-typedef unsigned long long	uint64_t;
-#endif
-#ifndef _UINT_LEAST64_T
-#define _UINT_LEAST64_T
-typedef unsigned long long	uint_least64_t;
-#endif
-#ifndef _UINT_FAST64_T
-#define _UINT_FAST64_T
-typedef unsigned long long	uint_fast64_t;
-#endif
-
-#endif /*#model(lp64)*/
-
-#ifndef _INTPTR_T
-#define _INTPTR_T
-typedef ssize_t intptr_t;
-#endif
-
-#ifndef _UINTPTR_T
-#define _UINTPTR_T
-typedef size_t   uintptr_t;
-#endif
-
-#ifndef _INTMAX_T
-#define _INTMAX_T
-#ifdef __GNUC__
-typedef long long int 		  intmax_t;
-#else
-typedef __int64	intmax_t;
-#endif /*__GNUC__*/
-#endif
-
-#ifndef _UINTMAX_T
-#define _UINTMAX_T
-#ifdef __GNUC__
-typedef unsigned long long int 	  uintmax_t;
-#else
-typedef unsigned __int64	uintmax_t;
-#endif /*__GNUC__*/
-#endif
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
-
-#define INT8_MAX	0x7f
-#define INT16_MAX	0x7fff
-#define INT32_MAX	0x7fffffff
-#define INT64_MAX	0x7fffffffffffffff
-
-#define INT8_MIN	(-INT8_MAX - 1)
-#define INT16_MIN	(-INT16_MAX - 1)
-#define INT32_MIN	(-INT32_MAX - 1)
-#define INT64_MIN	(-INT64_MAX - 1)
-
-#define UINT8_MAX	0xff
-#define UINT16_MAX	0xffff
-#define UINT32_MAX	0xffffffff
-#define UINT64_MAX	0xffffffffffffffff
-
-#define INT_LEAST8_MIN	INT8_MIN
-#define INT_LEAST16_MIN	INT16_MIN
-#define INT_LEAST32_MIN	INT32_MIN
-#define INT_LEAST64_MIN	INT64_MIN
-
-#define INT_LEAST8_MAX	INT8_MAX
-#define INT_LEAST16_MAX	INT16_MAX
-#define INT_LEAST32_MAX	INT32_MAX
-#define INT_LEAST64_MAX	INT64_MAX
-
-#define UINT_LEAST8_MAX		UINT8_MAX
-#define UINT_LEAST16_MAX	UINT16_MAX
-#define UINT_LEAST32_MAX	UINT32_MAX
-#define UINT_LEAST64_MAX	UINT64_MAX
-
-#define INT_FAST8_MIN	INT32_MIN
-#define INT_FAST16_MIN	INT32_MIN
-#define INT_FAST32_MIN	INT32_MIN
-#define INT_FAST64_MIN	INT64_MIN
-
-#define INT_FAST8_MAX	INT32_MAX
-#define INT_FAST16_MAX	INT32_MAX
-#define INT_FAST32_MAX	INT32_MAX
-#define INT_FAST64_MAX	INT64_MAX
-
-#define UINT_FAST8_MAX	UINT32_MAX
-#define UINT_FAST16_MAX	UINT32_MAX
-#define UINT_FAST32_MAX	UINT32_MAX
-#define UINT_FAST64_MAX	UINT64_MAX
-
-#if defined(lp64)
-
-#define INTPTR_MIN	INT64_MIN
-#define INTPTR_MAX	INT64_MAX
-#define UINTPTR_MAX	UINT64_MAX
-
-#define PTRDIFF_MIN	INT64_MIN
-#define PTRDIFF_MAX	INT64_MAX
-
-#define SIZE_MAX	INT64_MAX
-
-#else /*!#model(lp64)*/
-
-#define INTPTR_MIN	INT32_MIN
-#define INTPTR_MAX	INT32_MAX
-#define UINTPTR_MAX	UINT32_MAX
-
-#define PTRDIFF_MIN	INT32_MIN
-#define PTRDIFF_MAX	INT32_MAX
-
-#define SIZE_MAX	INT32_MAX
-
-#endif /*#model(lp64)*/
-
-#define INTMAX_MIN	INT64_MIN
-#define INTMAX_MAX	INT64_MAX
-#define UINTMAX_MAX	UINT64_MAX
-
-#define SIG_ATOMIC_MIN	INT32_MIN
-#define SIG_ATOMIC_MAX	INT32_MAX
-
-#define WCHAR_MIN	INT32_MIN
-#define WCHAR_MAX	INT32_MAX
-
-#define WINT_MIN	INT32_MIN
-#define WINT_MAX	INT32_MAX
-
-#endif /*!defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)*/
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
-
-#define INT8_C(v)	v
-#define INT16_C(v)	v
-#define INT32_C(v)	v
-#define INT64_C(v)	v##LL
-
-#define UINT8_C(v)	v##U
-#define UINT16_C(v)	v##U
-#define UINT32_C(v)	v##U
-#define UINT64_C(v)	v##ULL
-
-#define INTMAX_C(v)	v##LL
-#define UINTMAX_C(v)	v##ULL
-
-#endif /*!defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)*/
-
-#endif /*_STDINT_H*/

diff --git a/sys-devel/gcc/files/mkinfodir b/sys-devel/gcc/files/mkinfodir
deleted file mode 100755
index a62840ee86..0000000000
--- a/sys-devel/gcc/files/mkinfodir
+++ /dev/null
@@ -1,233 +0,0 @@
-#!/bin/bash
-# $Id: mkinfodir,v 1.1 2001/09/01 07:56:19 drobbins Exp $
-# Generate the top-level Info node, given a directory of Info files
-# and (optionally) a skeleton file.  The output will be suitable for a
-# top-level dir file.  The skeleton file contains info topic names in the
-# order they should appear in the output.  There are three special
-# lines that alter the behavior: a line consisting of just "--" causes
-# the next line to be echoed verbatim to the output.  A line
-# containing just "%%" causes all the remaining filenames (wildcards
-# allowed) in the rest of the file to be ignored.  A line containing
-# just "!!" exits the script when reached (unless preceded by a line
-# containing just "--").  Once the script reaches the end of the
-# skeleton file, it goes through the remaining files in the directory
-# in order, putting their entries at the end.  The script will use the
-# ENTRY information in each info file if it exists.  Otherwise it will
-# make a minimal entry.
-
-# sent by Jeffrey Osier <jeffrey@××××××.com>, who thinks it came from
-# zoo@×××××××××.com (david d `zoo' zuhn)
-
-# modified 7 April 1995 by Joe Harrington <jh@××××××××××××××××.gov> to
-# take special flags
-
-INFODIR=$1
-if [ $# = 2 ] ; then
-  SKELETON=$2
-else
-  SKELETON=/dev/null
-fi
-
-skip=
-
-if [ $# -gt 2 ] ; then
-  echo usage: $0 info-directory [ skeleton-file ] 1>&2
-  exit 1
-elif [ -z "${INFODIR}" ] ; then
-  INFODIR="%%DEFAULT_INFO_DIR%%"
-else
-  true
-fi
-
-if [ ! -d ${INFODIR} ] ; then
-  echo "$0: first argument must specify a directory"
-  exit 1
-fi
-
-### output the dir header
-echo "-*- Text -*-"
-echo "This file was generated automatically by $0."
-echo "This version was generated on `date`"
-echo "by `whoami`@`hostname` for `(cd ${INFODIR}; pwd)`"
-
-cat << moobler
-\$Id: mkinfodir,v 1.1 2001/09/01 07:56:19 drobbins Exp $
-This is the file .../info/dir, which contains the topmost node of the
-Info hierarchy.  The first time you invoke Info you start off
-looking at that node, which is (dir)Top.
-
-File: dir	Node: Top	This is the top of the INFO tree
-
-  This (the Directory node) gives a menu of major topics. 
-  Typing "q" exits, "?" lists all Info commands, "d" returns here,
-  "h" gives a primer for first-timers,
-  "mEmacs<Return>" visits the Emacs topic, etc.
-
-  In Emacs, you can click mouse button 2 on a menu item or cross reference
-  to select it.
-
-* Menu: The list of major topics begins on the next line.
-
-moobler
-
-### go through the list of files in the skeleton.  If an info file
-### exists, grab the ENTRY information from it.  If an entry exists
-### use it, otherwise create a minimal dir entry.
-###
-### Then remove that file from the list of existing files.  If any
-### additional files remain (ones that don't have a skeleton entry), 
-### then generate entries for those in the same way, putting the info for 
-### those at the end....
-
-infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*\.gz$' | grep -v '\-[0-9]*$' | egrep -v '^dir$|^dir\.info$|^dir\.orig$')`
-
-# echoing gets clobbered by backquotes; we do it the hard way...
-lines=`wc $SKELETON | awk '{print $1}'`
-line=1
-while [ $lines -ge $line ] ; do
-  # Read one line from the file.  This is so that we can echo lines with
-  # whitespace and quoted characters in them.
-  fileline=`awk NR==$line $SKELETON`
-
-  # flag fancy features
-  if [ ! -z "$echoline" ] ; then	# echo line
-    echo "$fileline"
-    fileline=
-    echoline=
-  elif [ "${fileline}" = "--" ] ; then	# should we echo the next line?
-    echoline=1
-  elif [ "${fileline}" = "%%" ] ; then	# eliminate remaining files from dir?
-    skip=1
-  elif [ "${fileline}" = "!!" ] ; then	# quit now
-    exit 0
-  fi
-
-  # handle files if they exist
-  for file in $fileline"" ; do	# expand wildcards ("" handles blank lines)
-
-    fname=
-
-    if [ -z "$echoline" -a ! -z "$file" ] ; then
-
-      # Find the file to operate upon.  Check both possible names.
-      infoname=`echo $file | sed 's/\.gz$//'`
-      infoname=`echo $infoname | sed 's/\.info$//'`
-      noext=
-      ext=
-      if [ -f ${INFODIR}/$infoname ] ; then
-        noext=$infoname
-      fi
-      if [ -f ${INFODIR}/${infoname}.info ] ; then
-        ext=${infoname}.info
-      fi
-      if [ -f ${INFODIR}/${infoname}.info.gz ] ; then
-	ext=${infoname}.info.gz
-      fi
-      # If it exists with both names take what was said in the file.
-      if [ ! -z "$ext" -a ! -z "$noext" ]; then
-        fname=$file
-        warn="### Warning: $ext and $noext both exist!  Using ${file}. ###"
-      elif [ ! \( -z "$ext" -a -z "$noext" \) ]; then
-        # just take the name if it exists only once
-        fname=${noext}${ext}
-      fi
-
-      # if we found something and aren't skipping, do the entry
-      if [ ! -z "$fname" ] ; then
-        if [ -z "$skip" ] ; then
-
-          if [ ! -z "$warn" ] ; then	# issue any warning
-	    echo $warn
-	    warn=
-          fi
-	  if [ "${fname##*.}" = "gz" ] ; then
-	    entry=`zcat ${INFODIR}/${fname} | sed -e '1,/START-INFO-DIR-ENTRY/d' \
-		     -e '/END-INFO-DIR-ENTRY/,$d' `
-	  else
-            entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \
-		     -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$fname`
-	  fi
-          if [ ! -z "${entry}" ] ; then
-            echo "${entry}"
-          else
-            echo "* ${infoname}: (${infoname})."
-          fi
-        fi
-
-        # remove the name from the directory listing
-	infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${fname} / /" -e "s/  / /g"`
-
-      fi
-
-    fi
-
-  done
-
-  line=`expr $line + 1`
-done
-
-if [ -z "${infofiles}" ] ; then
-  exit 0
-elif [ $lines -gt 0 ]; then
-  echo
-fi
-
-# Sort remaining files by INFO-DIR-SECTION.
-prevsect=
-filesectdata=`(cd ${INFODIR}; fgrep INFO-DIR-SECTION /dev/null ${infofiles} | \
-	      fgrep -v 'INFO-DIR-SECTION Miscellaneous' | \
-	      sort -t: -k2 -k1 | tr ' ' '_')`
-for sectdata in ${filesectdata}; do
-  file=`echo ${sectdata} | cut -d: -f1`
-  section=`sed -n -e 's/^INFO-DIR-SECTION //p' ${INFODIR}/${file}`
-  infofiles=`echo "" ${infofiles} "" | sed -e "s/ ${file} / /" -e "s/  / /g"`
-
-  if [ "${prevsect}" != "${section}" ] ; then
-    if [ ! -z "${prevsect}" ] ; then
-      echo ""
-    fi
-    echo "${section}"
-    prevsect="${section}"
-  fi
-  infoname=`echo $file | sed 's/\.gz$//'`
-  infoname=`echo $infoname | sed 's/\.info$//'`
-  if [ "${file##*.}" = "gz" ] ; then
-	    entry=`zcat ${INFODIR}/$file | sed -e '1,/START-INFO-DIR-ENTRY/d' \
-		     -e '/END-INFO-DIR-ENTRY/,$d' `
-	  else
-            entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \
-		     -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file`
-	  fi
-  if [ ! -z "${entry}" ] ; then
-    echo "${entry}"
-  elif [ ! -d "${INFODIR}/${file}" ] ; then
-    echo "* ${infoname}: (${infoname})."
-  fi
-done
-
-# Process miscellaneous files.
-for file in ${infofiles}; do
-  if [ ! -z "${prevsect}" ] ; then
-    echo ""
-    echo "Miscellaneous"
-    prevsect=""
-  fi
-
-  infoname=`echo $file | sed 's/\.gz$//'`
-  infoname=`echo $infoname | sed 's/\.info$//'`
-  if [ "${file##*.}" = "gz" ] ; then
-           entry=`zcat ${INFODIR}/${file} | sed -e '1,/START-INFO-DIR-ENTRY/d' \
-		     -e '/END-INFO-DIR-ENTRY/,$d'`
-	  else
-            entry=`sed -e '1,/START-INFO-DIR-ENTRY/d' \
-		     -e '/END-INFO-DIR-ENTRY/,$d' ${INFODIR}/$file`
-	  fi
-
-
-  if [ ! -z "${entry}" ] ; then
-    echo "${entry}"
-  elif [ ! -d "${INFODIR}/${file}" ] ; then
-    echo "* ${infoname}: (${infoname})."
-  fi
-done
-

diff --git a/sys-devel/gcc/files/pro-police-docs.patch b/sys-devel/gcc/files/pro-police-docs.patch
deleted file mode 100644
index 091ea44ef0..0000000000
--- a/sys-devel/gcc/files/pro-police-docs.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Index: gcc/doc/invoke.texi
-===================================================================
-RCS file: /cvsroot/gcc/gcc/gcc/doc/invoke.texi,v
-retrieving revision 1.364
-diff -c -3 -p -r1.364 invoke.texi
-*** gcc/doc/invoke.texi	21 Nov 2003 11:42:58 -0000	1.364
---- gcc/doc/invoke.texi	22 Nov 2003 08:12:35 -0000
-*************** in the following sections.
-*** 228,234 ****
-  -Wno-multichar  -Wnonnull  -Wpacked  -Wpadded @gol
-  -Wparentheses  -Wpointer-arith  -Wredundant-decls @gol
-  -Wreturn-type  -Wsequence-point  -Wshadow @gol
-! -Wsign-compare  -Wstrict-aliasing @gol
-  -Wswitch  -Wswitch-default  -Wswitch-enum @gol
-  -Wsystem-headers  -Wtrigraphs  -Wundef  -Wuninitialized @gol
-  -Wunknown-pragmas  -Wunreachable-code @gol
---- 228,234 ----
-  -Wno-multichar  -Wnonnull  -Wpacked  -Wpadded @gol
-  -Wparentheses  -Wpointer-arith  -Wredundant-decls @gol
-  -Wreturn-type  -Wsequence-point  -Wshadow @gol
-! -Wsign-compare  -Wstack-protector  -Wstrict-aliasing @gol
-  -Wswitch  -Wswitch-default  -Wswitch-enum @gol
-  -Wsystem-headers  -Wtrigraphs  -Wundef  -Wuninitialized @gol
-  -Wunknown-pragmas  -Wunreachable-code @gol
-*************** in the following sections.
-*** 681,686 ****
---- 681,687 ----
-  -fshort-double  -fshort-wchar @gol
-  -fverbose-asm  -fpack-struct  -fstack-check @gol
-  -fstack-limit-register=@var{reg}  -fstack-limit-symbol=@var{sym} @gol
-+ -fstack-protector  -fstack-protector-all @gol
-  -fargument-alias  -fargument-noalias @gol
-  -fargument-noalias-global  -fleading-underscore @gol
-  -ftls-model=@var{model} @gol
-*************** effectively.  Often, the problem is that
-*** 3014,3019 ****
---- 3015,3024 ----
-  complex; GCC will refuse to optimize programs when the optimization
-  itself is likely to take inordinate amounts of time.
-  
-+ @item -Wstack-protector
-+ @opindex Wstack-protector
-+ Warn when not issuing stack smashing protection for some reason
-+ 
-  @item -Werror
-  @opindex Werror
-  Make all warnings into errors.
-*************** and grows downwards, you can use the fla
-*** 11474,11479 ****
---- 11479,11502 ----
-  @option{-fstack-limit-symbol=__stack_limit} and
-  @option{-Wl,--defsym,__stack_limit=0x7ffe0000} to enforce a stack limit
-  of 128KB@.  Note that this may only work with the GNU linker.
-+ 
-+ @item -fstack-protector
-+ @item -fstack-protector-all
-+ @opindex fstack-protector
-+ @opindex fstack-protector-all
-+ @opindex fno-stack-protector
-+ Generate code to protect an application from a stack smashing
-+ attack. The features are (1) the insertion of random value next to the
-+ frame pointer to detect the integrity of the stack, (2) the reordering
-+ of local variables to place buffers after pointers to avoid the
-+ corruption of pointers that could be used to further corrupt arbitrary
-+ memory locations, (3) the copying of pointers in function arguments to
-+ an area preceding local variable buffers to prevent the corruption of
-+ pointers that could be used to further corrupt arbitrary memory
-+ locations, and the (4) omission of instrumentation code from some
-+ functions to decrease the performance overhead.  If the integrity
-+ would be broken, the program is aborted.  If no-stack-protector is
-+ specified, instrumentation codes are generated at every functions.
-  
-  @cindex aliasing of parameters
-  @cindex parameters, aliased

diff --git a/sys-devel/gcc/files/scan_libgcc_linked_ssp.sh b/sys-devel/gcc/files/scan_libgcc_linked_ssp.sh
deleted file mode 100755
index 35119e5d93..0000000000
--- a/sys-devel/gcc/files/scan_libgcc_linked_ssp.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Author:  Martin Schlemmer <azarah@g.o>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/scan_libgcc_linked_ssp.sh,v 1.4 2007/05/05 05:13:15 vapier Exp $
-
-usage() {
-cat << "USAGE_END"
-Usage: can_libgcc_linked_ssp.sh
-
-    This scans the system for files that contains the __guard symbol, that was
-    linked against libgcc.
-
-
-USAGE_END
-
-        exit 1
-}
-
-if [ "$#" -ne 0 ]
-then
-	usage
-fi
-
-source /etc/profile || exit 1
-source /etc/init.d/functions.sh || exit 1
-
-AWKDIR="$(portageq envvar PORTDIR)/sys-devel/gcc/files/awk"
-
-if [ ! -r "${AWKDIR}/scanforssp.awk" ]
-then
-	eerror "${0##*/}: ${AWKDIR}/scanforssp.awk does not exist!"
-	exit 1
-fi
-
-einfo "Scanning system for __guard@GCC symbols..."
-/bin/gawk -f "${AWKDIR}/scanforssp.awk"
-
-exit $?
-
-
-# vim:ts=4

diff --git a/sys-devel/gcc/files/solaris-i386-ld-emulation.patch b/sys-devel/gcc/files/solaris-i386-ld-emulation.patch
deleted file mode 100644
index e3e8b04b5c..0000000000
--- a/sys-devel/gcc/files/solaris-i386-ld-emulation.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Since GNU ld 2.21, targets *_sol2 exist that strictly stick to the
-Solaris 2 ABI.  GCC enables them when 2.21 or higher was found.
-Unfortunately 2.22 requires the *_sol2 targets to be used leading to a
-useless toolchain upon upgrade of binutils, when gcc wasn't compiled
-with 2.21 or newer yet.
-
-On Solaris sparc, this problem is not so severe, since gcc won't pass an
-explicit target when neither -m32 or -m64 were given.  It lets binutils
-decide, which's default target is fine.  However, on i386, the specfile
-always emits the target to the call to ld, because of the m64 && !m64.
-Use m64 and m32 like the sparc specs instead, to also have ld figure out
-the default target itself.
-
-This not only fixes the upgrade path (too late for most, unfortunately),
-but also makes our toolchain a bit more resistant against switching
-between versions.
-
---- gcc/config/i386/sol2-10.h
-+++ gcc/config/i386/sol2-10.h
-@@ -131,14 +131,14 @@
- #endif
- 
- #define TARGET_LD_EMULATION "%{m64:-m " X86_64_EMULATION "}" \
--			    "%{!m64:-m " I386_EMULATION "} "
-+			    "%{m32:-m " I386_EMULATION "} "
- #else
- #define TARGET_LD_EMULATION ""
- #endif
- 
- #undef LINK_ARCH_SPEC
- #define LINK_ARCH_SPEC TARGET_LD_EMULATION \
--		       "%{m64:" LINK_ARCH64_SPEC "}%{!m64:" LINK_ARCH32_SPEC "}"
-+		       "%{m64:" LINK_ARCH64_SPEC "}%{m32:" LINK_ARCH32_SPEC "}"
- 
- /* We do not need to search a special directory for startup files.  */
- #undef MD_STARTFILE_PREFIX

diff --git a/sys-devel/gcc/files/stubs/gcc-3.3-htb-stub.patch b/sys-devel/gcc/files/stubs/gcc-3.3-htb-stub.patch
deleted file mode 100644
index f6d81040c5..0000000000
--- a/sys-devel/gcc/files/stubs/gcc-3.3-htb-stub.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- gcc-3.3.6/gcc/c-opts.c
-+++ gcc-3.3.6/gcc/c-opts.c
-@@ -193,6 +193,8 @@ static void sanitize_cpp_opts PARAMS ((v
-   OPT("fall-virtual",		CL_CXX,   OPT_fall_virtual)		     \
-   OPT("falt-external-templates",CL_CXX,   OPT_falt_external_templates)	     \
-   OPT("fasm",			CL_ALL,   OPT_fasm)			     \
-+  OPT("fbc-strings-only",       CL_ALL,   OPT_fbc_strings_only)              \
-+  OPT("fbounds-checking",       CL_ALL,   OPT_fbounds_checking)              \
-   OPT("fbuiltin",		CL_ALL,   OPT_fbuiltin)			     \
-   OPT("fbuiltin-",		CL_ALL | CL_JOINED, OPT_fbuiltin_)	     \
-   OPT("fcheck-new",		CL_CXX,   OPT_fcheck_new)		     \
-@@ -1037,6 +1039,11 @@ c_common_decode_option (argc, argv)
-       flag_no_asm = !on;
-       break;
- 
-+    case OPT_fbounds_checking:
-+    case OPT_fbc_strings_only:
-+      warning ("htb stub: bounds checking is not supported");
-+      break;
-+
-     case OPT_fbuiltin:
-       flag_no_builtin = !on;
-       break;
---- gcc-3.3.6/gcc/cp/lang-options.h
-+++ gcc-3.3.6/gcc/cp/lang-options.h
-@@ -32,6 +32,8 @@ DEFINE_LANG_NAME ("C++")
-   { "-fno-alt-external-templates", "" },
-   { "-fansi-overloading", "" },
-   { "-fno-ansi-overloading", "" },
-+  { "-fbounds-checking", "" },
-+  { "-fno-bounds-checking", "" },
-   { "-fcheck-new", 
-     N_("Check the return value of new") },
-   { "-fno-check-new", "" },
-@@ -117,6 +119,9 @@ DEFINE_LANG_NAME ("C++")
-   { "-fxref", 
-     N_("Emit cross referencing information") },
-   { "-fno-xref", "" },
-+  { "-fbounds-checking",
-+    N_("Generate array and pointer bounds checking code") },
-+  { "-fno-bounds-checking", "" },
- 
-   { "-Wreturn-type", 
-     N_("Warn about inconsistent return types") },
---- gcc-3.3.6/gcc/toplev.c
-+++ gcc-3.3.6/gcc/toplev.c
-@@ -1249,6 +1267,12 @@ documented_lang_options[] =
-   { "-fshort-wchar",
-     N_("Override the underlying type for wchar_t to `unsigned short'") },
-   { "-fno-short-wchar", "" },
-+  { "-fbounds-checking",
-+    N_("Generate array and pointer bounds checking code") },
-+  { "-fno-bounds-checking", "" },
-+  { "-fbc-strings-only",
-+    N_("Restrict bounds checking to strings only") },
-+  { "-fno-bc-strings-only", "" },
- 
-   { "-Wall",
-     N_("Enable most warning messages") },

diff --git a/sys-devel/gcc/files/stubs/gcc-3.3-ssp-stub.patch b/sys-devel/gcc/files/stubs/gcc-3.3-ssp-stub.patch
deleted file mode 100644
index ed996e7df4..0000000000
--- a/sys-devel/gcc/files/stubs/gcc-3.3-ssp-stub.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- gcc-3.3.6/gcc/toplev.c
-+++ gcc-3.3.6/gcc/toplev.c
-@@ -904,6 +904,10 @@ int align_functions_log;
-    minimum function alignment.  Zero means no alignment is forced.  */
- int force_align_functions_log;
- 
-+int flag_propolice_protection = 0;
-+int flag_stack_protection = 0;
-+int warn_stack_protector = 0;
-+
- /* Table of supported debugging formats.  */
- static const struct
- {
-@@ -1188,6 +1197,10 @@ static const lang_independent_options f_
-    N_("Trap for signed overflow in addition / subtraction / multiplication") },
-   { "new-ra", &flag_new_regalloc, 1,
-    N_("Use graph coloring register allocation.") },
-+  {"stack-protector", &flag_propolice_protection, 1,
-+   N_("Enables stack protection") },
-+  {"stack-protector-all", &flag_stack_protection, 1,
-+   N_("Enables stack protection of every function") } ,
- };
- 
- /* Table of language-specific options.  */
-@@ -1547,7 +1560,9 @@ static const lang_independent_options W_
-   {"missing-noreturn", &warn_missing_noreturn, 1,
-    N_("Warn about functions which might be candidates for attribute noreturn") },
-   {"strict-aliasing", &warn_strict_aliasing, 1,
--   N_ ("Warn about code which might break the strict aliasing rules") }
-+   N_ ("Warn about code which might break the strict aliasing rules") },
-+  {"stack-protector", &warn_stack_protector, 1,
-+   N_("Warn when disabling stack protector for some reason")}
- };
- 
- void
-@@ -5230,6 +5247,9 @@ process_options ()
-     /* The presence of IEEE signaling NaNs, implies all math can trap.  */
-     if (flag_signaling_nans)
-       flag_trapping_math = 1;
-+
-+    if (flag_stack_protection || flag_propolice_protection)
-+      warning ("ssp stub: stack protector is not supported");
- }
- 
- /* Initialize the compiler back end.  */

diff --git a/sys-devel/gcc/files/stubs/gcc-3.4-htb-stub.patch b/sys-devel/gcc/files/stubs/gcc-3.4-htb-stub.patch
deleted file mode 100644
index 2be61a2401..0000000000
--- a/sys-devel/gcc/files/stubs/gcc-3.4-htb-stub.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- gcc-3.4.4/gcc/c.opt
-+++ gcc-3.4.4/gcc/c.opt
-@@ -426,6 +426,14 @@ fasm
- C ObjC C++ ObjC++
- Recognize the \"asm\" keyword
- 
-+fbounds-checking
-+C
-+Generate code to check bounds before indexing arrays
-+
-+fbc-strings-only
-+C
-+Restrict bounds checking to strings only
-+
- fbuiltin
- C ObjC C++ ObjC++
- Recognize built-in functions
---- gcc-3.4.4/gcc/c-opts.c
-+++ gcc-3.4.4/gcc/c-opts.c
-@@ -708,6 +708,12 @@ c_common_handle_option (size_t scode, co
-       flag_no_asm = !value;
-       break;
- 
-+    case OPT_fbounds_checking:
-+    case OPT_fbc_strings_only:
-+      if (value)
-+        warning ("htb stub: bounds checking is not supported");
-+      break;
-+
-     case OPT_fbuiltin:
-       flag_no_builtin = !value;
-       break;

diff --git a/sys-devel/gcc/files/stubs/gcc-3.4-ssp-stub.patch b/sys-devel/gcc/files/stubs/gcc-3.4-ssp-stub.patch
deleted file mode 100644
index 3f620f30ca..0000000000
--- a/sys-devel/gcc/files/stubs/gcc-3.4-ssp-stub.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- gcc-3.4.3/gcc/common.opt
-+++ gcc-3.4.3/gcc/common.opt
-@@ -152,6 +152,10 @@ Wunused-variable
- Common
- Warn when a variable is unused
- 
-+Wstack-protector
-+Common
-+Warn when not issuing stack smashing protection for some reason
-+
- aux-info
- Common Separate
- -aux-info <file>	Emit declaration information into <file>
-@@ -743,6 +747,14 @@ fzero-initialized-in-bss
- Common
- Put zero initialized data in the bss section
- 
-+fstack-protector
-+Common
-+Enables stack protection
-+
-+fstack-protector-all
-+Common
-+Enables stack protection of every function
-+
- g
- Common JoinedOrMissing
- Generate debug information in default format
---- gcc-3.4.3/gcc/opts.c
-+++ gcc-3.4.3/gcc/opts.c
-@@ -804,6 +807,13 @@ common_handle_option (size_t scode, cons
-       warn_unused_variable = value;
-       break;
- 
-+    case OPT_fstack_protector:
-+    case OPT_fstack_protector_all:
-+    case OPT_Wstack_protector:
-+      if (value)
-+        warning ("ssp stub: stack protector is not supported");
-+      break;
-+
-     case OPT_aux_info:
-     case OPT_aux_info_:
-       aux_info_file_name = arg;

diff --git a/sys-devel/gcc/files/stubs/gcc-4.0-htb-stub.patch b/sys-devel/gcc/files/stubs/gcc-4.0-htb-stub.patch
deleted file mode 100644
index 4a515c56e2..0000000000
--- a/sys-devel/gcc/files/stubs/gcc-4.0-htb-stub.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- gcc-4.0.0/gcc/c.opt
-+++ gcc-4.0.0/gcc/c.opt
-@@ -457,6 +457,14 @@ fasm
- C ObjC C++ ObjC++
- Recognize the \"asm\" keyword
- 
-+fbounds-checking
-+C
-+Generate code to check bounds before indexing arrays
-+
-+fbc-strings-only
-+C
-+Restrict bounds checking to strings only
-+
- fbuiltin
- C ObjC C++ ObjC++
- Recognize built-in functions
---- gcc-4.0.0/gcc/c-opts.c
-+++ gcc-4.0.0/gcc/c-opts.c
-@@ -548,6 +549,12 @@ c_common_handle_option (size_t scode, co
-       flag_no_asm = !value;
-       break;
- 
-+    case OPT_fbc_strings_only:
-+    case OPT_fbounds_checking:
-+      if (value)
-+        warning ("htb stub: bounds checking is not supported");
-+      break;
-+
-     case OPT_fbuiltin:
-       flag_no_builtin = !value;
-       break;

diff --git a/sys-devel/gcc/files/stubs/gcc-4.0-ssp-stub.patch b/sys-devel/gcc/files/stubs/gcc-4.0-ssp-stub.patch
deleted file mode 100644
index 3f620f30ca..0000000000
--- a/sys-devel/gcc/files/stubs/gcc-4.0-ssp-stub.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- gcc-3.4.3/gcc/common.opt
-+++ gcc-3.4.3/gcc/common.opt
-@@ -152,6 +152,10 @@ Wunused-variable
- Common
- Warn when a variable is unused
- 
-+Wstack-protector
-+Common
-+Warn when not issuing stack smashing protection for some reason
-+
- aux-info
- Common Separate
- -aux-info <file>	Emit declaration information into <file>
-@@ -743,6 +747,14 @@ fzero-initialized-in-bss
- Common
- Put zero initialized data in the bss section
- 
-+fstack-protector
-+Common
-+Enables stack protection
-+
-+fstack-protector-all
-+Common
-+Enables stack protection of every function
-+
- g
- Common JoinedOrMissing
- Generate debug information in default format
---- gcc-3.4.3/gcc/opts.c
-+++ gcc-3.4.3/gcc/opts.c
-@@ -804,6 +807,13 @@ common_handle_option (size_t scode, cons
-       warn_unused_variable = value;
-       break;
- 
-+    case OPT_fstack_protector:
-+    case OPT_fstack_protector_all:
-+    case OPT_Wstack_protector:
-+      if (value)
-+        warning ("ssp stub: stack protector is not supported");
-+      break;
-+
-     case OPT_aux_info:
-     case OPT_aux_info_:
-       aux_info_file_name = arg;

diff --git a/sys-devel/gcc/gcc-5.4.0-r4.ebuild b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
index e98d8d8b50..22f5c2ae33 100644
--- a/sys-devel/gcc/gcc-5.4.0-r4.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
@@ -54,12 +54,8 @@ src_prepare() {
 
 	use vanilla && return 0
 
-	# make sure solaris-x64 doesn't misdetect tls support, bug #505446
-	#epatch "${FILESDIR}"/4.7.2/solaris-x64-tls-gnu-as.patch
-
 	# make sure 64-bits native targets don't screw up the linker paths
 	epatch "${FILESDIR}"/no-libs-for-startfile.patch
-	epatch "${FILESDIR}"/${P}-libc_name_p.patch #631976
 	if use prefix; then
 		epatch "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
 		# try /usr/lib32 in 32bit profile on x86_64-linux (needs

diff --git a/sys-devel/gcc/gcc-6.4.0-r2.ebuild b/sys-devel/gcc/gcc-6.4.0-r2.ebuild
deleted file mode 100644
index cdf69fdfb8..0000000000
--- a/sys-devel/gcc/gcc-6.4.0-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.4"
-UCLIBC_VER="1.0"
-CYGWINPORTS_GITREV="a03d77536f40d1a6335b6d313a4e4a4dff38ce66" # gcc-6.4.0-3
-
-inherit eutils toolchain flag-o-matic
-
-KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	!prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )
-	kernel_linux? ( >=${CATEGORY}/binutils-2.20 )
-	kernel_Darwin? ( ${CATEGORY}/binutils-apple )"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.13 ) )"
-fi
-
-src_prepare() {
-	toolchain_src_prepare
-
-	use vanilla && return 0
-
-	# make sure 64-bits native targets don't screw up the linker paths
-	epatch "${FILESDIR}"/no-libs-for-startfile.patch
-	if use prefix; then
-		epatch "${FILESDIR}"/4.5.2/prefix-search-dirs.patch
-		# try /usr/lib32 in 32bit profile on x86_64-linux (needs
-		# --enable-multilib), but this does make sense in prefix only
-		epatch "${FILESDIR}"/${PN}-4.8.3-linux-x86-on-amd64.patch
-	fi
-
-	# make it have correct install_names on Darwin
-	epatch "${FILESDIR}"/4.3.3/darwin-libgcc_s-installname.patch
-}
-
-src_configure() {
-	local myconf=()
-	case ${CTARGET}:" ${USE} " in
-		powerpc*-darwin*)
-			# bug #381179
-			filter-flags "-mcpu=*" "-mtune=*"
-		;;
-		*-solaris*)
-			# todo: some magic for native vs. GNU linking?
-			myconf+=( --with-gnu-ld --with-gnu-as --enable-largefile )
-		;;
-		i[34567]86-*-linux*:*" prefix "*)
-			# to allow the linux-x86-on-amd64.patch become useful, we need
-			# to enable multilib, even if there is just one multilib option.
-			myconf+=( --enable-multilib )
-			if [[ ${CBUILD:-${CHOST}} == "${CHOST}" ]]; then
-				# we might be on x86_64-linux, but don't do cross-compile, so
-				# tell the host-compiler to really create 32bits (for stage1)
-				# (real x86-linux-gcc also accept -m32).
-				append-flags -m32
-			fi
-		;;
-	esac
-
-	# Since GCC 4.1.2 some non-posix (?) /bin/sh compatible code is used, at
-	# least on Solaris, and AIX /bin/sh is way too slow,
-	# so force it to use $BASH (that portage uses) - it can't be EPREFIX
-	# in case that doesn't exist yet
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	toolchain_src_configure "${myconf[@]}"
-}

diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index 51f143604e..7b98f1a1c7 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -20,7 +20,6 @@
     <flag name="libssp">Build SSP support into a dedicated library rather than use the
       code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag>
     <flag name="mpx">Enable support for Intel Memory Protection Extensions (MPX)</flag>
-    <flag name="mudflap">Add support for mudflap, a pointer use checking library</flag>
     <flag name="nopie">Disable PIE support (NOT FOR GENERAL USE)</flag>
     <flag name="nossp">Disable SSP support (NOT FOR GENERAL USE)</flag>
     <flag name="objc">Build support for the Objective C code language</flag>
@@ -28,7 +27,6 @@
     <flag name="objc-gc">Build support for the Objective C code language Garbage
       Collector</flag>
     <flag name="pgo">Build GCC using Profile Guided Optimization (PGO)</flag>
-    <flag name="regression-test">Run the testsuite and install the results (requires FEATURES=test)</flag>
     <flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag>
     <flag name="ssp">Build packages with stack smashing protector on by default</flag>
     <flag name="systemtap">enable systemtap static probe points</flag>