commit:     77608c2c78588a7660212a0e1d293706516274f3
Author:     Marco Leise <marco.leise <AT> gmx <DOT> de>
AuthorDate: Mon Mar  9 18:46:11 2020 +0000
Commit:     Marco Leise <marco.leise <AT> gmx <DOT> de>
CommitDate: Mon Mar  9 18:46:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=77608c2c

replaced own forks of GCC ebuilds with system-wide ebuild

Signed-off-by: Marco Leise <marco.leise <AT> gmx.de>

 dev-util/gdmd/Manifest                             |   2 +-
 dev-util/gdmd/files/gdmd-no-dmd-conf.patch         |  12 +
 dev-util/gdmd/gdmd-6.4.0.ebuild                    |  33 --
 dev-util/gdmd/gdmd-7.3.0.ebuild                    |  33 --
 dev-util/gdmd/gdmd-9.2.0.ebuild                    |  27 ++
 eclass/dlang-compilers.eclass                      |   3 +-
 eclass/dlang.eclass                                |   4 +-
 profiles/use.desc                                  |   3 +-
 sys-devel/gcc/Manifest                             |   7 -
 .../gcc/files/3.3.4/libffi-without-libgcj.patch    |  22 --
 .../files/3.4.3/libffi-nogcj-lib-path-fix.patch    |  40 ---
 .../gcc/files/3.4.3/libffi-without-libgcj.patch    |  40 ---
 .../gcc/files/3.4.4/gcc-3.4.4-cross-compile.patch  |  63 ----
 .../gcc/files/4.1.0/gcc-4.1.0-cross-compile.patch  |  40 ---
 .../gcc-4.1.0-fast-math-i386-Os-workaround.patch   |  64 ----
 sys-devel/gcc/files/awk/fixlafiles.awk             | 313 -------------------
 sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la   | 334 ---------------------
 sys-devel/gcc/files/c89                            |  20 --
 sys-devel/gcc/files/c99                            |  21 --
 sys-devel/gcc/files/fix_libtool_files.sh           |  66 ----
 sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch      |  66 ----
 sys-devel/gcc/files/gcc-configure-LANG.patch       |  64 ----
 sys-devel/gcc/files/gcc-configure-texinfo.patch    |  16 -
 sys-devel/gcc/files/gcc-spec-env-r1.patch          |  87 ------
 sys-devel/gcc/files/gcc-spec-env.patch             |  42 ---
 sys-devel/gcc/files/gdc-7-pgo.patch                |  15 -
 sys-devel/gcc/files/gdc-pgo.patch                  |  15 -
 sys-devel/gcc/gcc-6.4.0-r1.ebuild                  |  42 ---
 sys-devel/gcc/gcc-7.3.0-r3.ebuild                  |  48 ---
 sys-devel/gcc/metadata.xml                         |  37 ---
 30 files changed, 44 insertions(+), 1535 deletions(-)

diff --git a/dev-util/gdmd/Manifest b/dev-util/gdmd/Manifest
index 0f35556..0866ade 100644
--- a/dev-util/gdmd/Manifest
+++ b/dev-util/gdmd/Manifest
@@ -1 +1 @@
-DIST gdmd-2.068.2.tar.gz 23488 BLAKE2B 
0add18bad42a7a2f562599af95acfbea9d57014eae4360754269fbedf7bbd869d4cd9eb9c00e8d9a0085a7c479fd5dadce1f1f413bbc5139f7c619691c81c118
 SHA512 
2614bd7ae116653368b44f33ddbb6f5690b0f28273e134129da19e98d71d5105386a901b647e68c6778c71f056ff4958433048e6db12f0a2895b5c8a39dad016
+DIST gdmd-0.1.0.tar.gz 7794 BLAKE2B 
f613c1faf7abb9f72990e21dfdf21e69f4d83fde5d7d6a8a0ccac16a21c0cf39f2d03b2fba7f9b19009b1e2198413c99653635a32cbad48bb8b5dfbf5da1ebab
 SHA512 
54c1b56e252feb024d400a03df7d7b3e5942f98ce6542d77030659ec09bba3770426fc88e143550d24be8272dfa4ff510de8335badfbf9ae6e5f5b6063216fd3

diff --git a/dev-util/gdmd/files/gdmd-no-dmd-conf.patch 
b/dev-util/gdmd/files/gdmd-no-dmd-conf.patch
new file mode 100644
index 0000000..30f2a09
--- /dev/null
+++ b/dev-util/gdmd/files/gdmd-no-dmd-conf.patch
@@ -0,0 +1,12 @@
+--- a/dmd-script       2020-03-09 19:10:12.000000000 +0100
++++ b/dmd-script       2020-03-09 19:03:57.320213593 +0100
+@@ -307,9 +307,6 @@
+     exit 0;
+ }
+
+-# Load dmd.conf before before parsing arguments.
+-readINI();
+-
+ if ($ENV{DFLAGS}) {
+     push @ARGV, split /\s+/, $ENV{DFLAGS};
+ }

diff --git a/dev-util/gdmd/gdmd-6.4.0.ebuild b/dev-util/gdmd/gdmd-6.4.0.ebuild
deleted file mode 100644
index e80c596..0000000
--- a/dev-util/gdmd/gdmd-6.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Wrapper script for gdc that emulates the dmd command"
-HOMEPAGE="http://www.gdcproject.org/";
-LICENSE="GPL-3+"
-
-SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-DEPEND="=sys-devel/gcc-${PV}*[d]"
-RDEPEND="${DEPEND}"
-FRONTEND="2.068.2"
-SRC_URI="https://codeload.github.com/D-Programming-GDC/gdmd/tar.gz/v${FRONTEND}
 -> gdmd-${FRONTEND}.tar.gz"
-S="${WORKDIR}/GDMD-${FRONTEND}"
-
-DLANG_PACKAGE_TYPE="single"
-DLANG_USE_COMPILER="gdc-${PV}"
-
-inherit dlang
-
-d_src_compile() {
-       local versions="GCC_49_Plus"
-       dlang_compile_bin "gdmd" "src/main.d" "src/gdmd/*.d"
-}
-
-d_src_install() {
-       local binPath="usr/${CHOST}/gcc-bin/${PV}"
-       exeinto "${binPath}"
-       newexe gdmd "${CHOST}-gdmd"
-       ln -f "${D}${binPath}/${CHOST}-gdmd" "${D}${binPath}/gdmd" || die 
"Could not create 'gdmd' hardlink"
-}

diff --git a/dev-util/gdmd/gdmd-7.3.0.ebuild b/dev-util/gdmd/gdmd-7.3.0.ebuild
deleted file mode 100644
index 39ed4c7..0000000
--- a/dev-util/gdmd/gdmd-7.3.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Wrapper script for gdc that emulates the dmd command"
-HOMEPAGE="http://www.gdcproject.org/";
-LICENSE="GPL-3+"
-
-SLOT="${PV}"
-KEYWORDS="amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 
~ppc-macos"
-DEPEND="=sys-devel/gcc-${PV}*[d]"
-RDEPEND="${DEPEND}"
-FRONTEND="2.068.2"
-SRC_URI="https://codeload.github.com/D-Programming-GDC/gdmd/tar.gz/v${FRONTEND}
 -> gdmd-${FRONTEND}.tar.gz"
-S="${WORKDIR}/GDMD-${FRONTEND}"
-
-DLANG_PACKAGE_TYPE="single"
-DLANG_USE_COMPILER="gdc-${PV}"
-
-inherit dlang
-
-d_src_compile() {
-       local versions="GCC_49_Plus"
-       dlang_compile_bin "gdmd" "src/main.d" "src/gdmd/*.d"
-}
-
-d_src_install() {
-       local binPath="usr/${CHOST}/gcc-bin/${PV}"
-       exeinto "${binPath}"
-       newexe gdmd "${CHOST}-gdmd"
-       ln -f "${D}${binPath}/${CHOST}-gdmd" "${D}${binPath}/gdmd" || die 
"Could not create 'gdmd' hardlink"
-}

diff --git a/dev-util/gdmd/gdmd-9.2.0.ebuild b/dev-util/gdmd/gdmd-9.2.0.ebuild
new file mode 100644
index 0000000..0c66a62
--- /dev/null
+++ b/dev-util/gdmd/gdmd-9.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Wrapper script for gdc that emulates the dmd command"
+HOMEPAGE="http://www.gdcproject.org/";
+LICENSE="GPL-3+"
+
+SLOT="${PV}"
+KEYWORDS="amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 
~ppc-macos"
+RDEPEND="=sys-devel/gcc-${PV}*[d]"
+RELEASE="0.1.0"
+SRC_URI="https://codeload.github.com/D-Programming-GDC/gdmd/tar.gz/script-${RELEASE}
 -> gdmd-${RELEASE}.tar.gz"
+PATCHES="${FILESDIR}/${PN}-no-dmd-conf.patch"
+S="${WORKDIR}/gdmd-script-${RELEASE}"
+
+src_compile() {
+       :
+}
+
+src_install() {
+       local binPath="usr/${CHOST}/gcc-bin/${PV}"
+       exeinto "${binPath}"
+       newexe dmd-script "${CHOST}-gdmd"
+       ln -f "${D}/${binPath}/${CHOST}-gdmd" "${D}/${binPath}/gdmd" || die 
"Could not create 'gdmd' hardlink"
+}

diff --git a/eclass/dlang-compilers.eclass b/eclass/dlang-compilers.eclass
index 4dc0ff5..ccf0ece 100644
--- a/eclass/dlang-compilers.eclass
+++ b/eclass/dlang-compilers.eclass
@@ -45,8 +45,7 @@ dlang-compilers_declare_versions() {
 
        # GDC (alpha, hppa, sparc: masked "d" USE-flag)
        __dlang_gdc_frontend=(
-               ["6.4.0"]="2.068 alpha amd64 arm arm64 hppa ia64 ~m68k ~mips 
ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-               ["7.3.0"]="2.081 alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc 
ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+               ["9.2.0"]="2.076 ~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips 
ppc ppc64 ~riscv s390 ~sh sparc x86"
        )
 
        # LDC

diff --git a/eclass/dlang.eclass b/eclass/dlang.eclass
index 860e59a..5373cc8 100644
--- a/eclass/dlang.eclass
+++ b/eclass/dlang.eclass
@@ -323,8 +323,8 @@ __dlang_compiler_masked_archs_for_version_range() {
        # RDEPEND.
 
        local iuse=$1
-       if [[ "${DLANG_PACKAGE_TYPE}" == "dmd" ]] && [[ "$iuse" == gdc* ]]; then
-               local depend="$iuse? ( $2 "=dev-util/gdmd-$(ver_rs 1-2 . 
${iuse#gdc-})*" )"
+       if [[ "$iuse" == gdc* ]]; then
+               local depend="$iuse? ( "=dev-util/gdmd-$(ver_rs 1-2 . 
${iuse#gdc-})*" )"
        else
                local depend="$iuse? ( $2 )"
        fi

diff --git a/profiles/use.desc b/profiles/use.desc
index ee58132..4594421 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -25,8 +25,7 @@ dmd-2_086 - Build for DMD 2.086
 dmd-2_087 - Build for DMD 2.087
 dmd-2_088 - Build for DMD 2.088
 dmd-2_089 - Build for DMD 2.089
-gdc-6_4_0 - Build for GCC 6.4.0
-gdc-7_3_0 - Build for GCC 7.3.0
+gdc-9_2_0 - Build for GCC 9.2.0
 ldc2-1_9 - Build for ldc2 1.9
 ldc2-1_12 - Build for ldc2 1.12
 ldc2-1_13 - Build for ldc2 1.13

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
deleted file mode 100644
index 1fdb83e..0000000
--- a/sys-devel/gcc/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST ecj-4.5.jar 1470676 BLAKE2B 
793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80
 SHA512 
d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
-DIST gcc-6.4.0-patches-1.3.tar.bz2 13617 BLAKE2B 
6bfb1d70397e6ca4359e5d190e36003c18c7a03a9be4f923461dcff11307601e6b3502a2e289585b53baeb919008d83c29ad24078f814aed9b331140e4687419
 SHA512 
91be7c8db0004cdd150fec0f8daa709374753d2f524c58087dcf45b6696dbd609972297e866f971fba1aa679464cf96a384dd111e104183c0939ab69add017b2
-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.3.0-patches-1.4.tar.bz2 8238 BLAKE2B 
72a5dcb046558c8f5c3a75040fe24ce1106c43af7510d6febf667b4377cb9caea5ebe9e1287af90e4ebfffa3f3f22ca85f533acf57c2e2d896f92adc1659b9f5
 SHA512 
24ed0d82240426efb111bbf48913b96fdc824ae3aa5a653298a726ebe64a40791f484229bbab9cc58f73d658e0b4b83ccd13081cfbea6e1673ef1d076cca3b33
-DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B 
dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302
 SHA512 
ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
-DIST gdc-2.068.2_gcc-6.tar.gz 4184500 BLAKE2B 
aeaa818a471364f2d5d80e3afb48fd260ad468a35c5385bf95c79137ccd59b3dcc9d1c2474e18eee0c6ebea5bfa7131cb1bb55f358a7ec16976547fe15ba25d2
 SHA512 
f3fab36a162cf43eab4fe37d79bbd9a04b6b7c3c536c0db65afbb48013c1d23c3545bec1a714e1b11ac1af9cc6709c7dfc6c61435dc5df3c52846e1241c02416

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 507d42f..0000000
--- 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.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 b5195e4..0000000
--- 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 b270a06..0000000
--- 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.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 0389543..0000000
--- 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/4.1.0/gcc-4.1.0-cross-compile.patch 
b/sys-devel/gcc/files/4.1.0/gcc-4.1.0-cross-compile.patch
deleted file mode 100644
index 523caa4..0000000
--- a/sys-devel/gcc/files/4.1.0/gcc-4.1.0-cross-compile.patch
+++ /dev/null
@@ -1,40 +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/unwind-dw2.c
-+++ gcc/unwind-dw2.c
-@@ -253,9 +253,11 @@
- }
- #endif
- 
-+#ifndef inhibit_libc
- #ifdef MD_UNWIND_SUPPORT
- #include MD_UNWIND_SUPPORT
- #endif
-+#endif
- 
- /* Extract any interesting information from the CIE for the translation
-    unit F belongs to.  Return a pointer to the byte after the augmentation,
---- gcc/configure
-+++ gcc/configure
-@@ -12857,7 +12857,7 @@ then
-           | powerpc*-*-*,powerpc64*-*-*)
-               CROSS="$CROSS -DNATIVE_CROSS" ;;
-       esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
-         SYSTEM_HEADER_DIR=$build_system_header_dir
- fi
- 
---- gcc/configure.ac
-+++ gcc/configure.ac
-@@ -1717,7 +1717,7 @@ then
-           | powerpc*-*-*,powerpc64*-*-*)
-               CROSS="$CROSS -DNATIVE_CROSS" ;;
-       esac
--elif test "x$TARGET_SYSTEM_ROOT" != x; then
-+elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
-         SYSTEM_HEADER_DIR=$build_system_header_dir 
- fi
- 

diff --git 
a/sys-devel/gcc/files/4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch 
b/sys-devel/gcc/files/4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch
deleted file mode 100644
index 6090d66..0000000
--- a/sys-devel/gcc/files/4.1.0/gcc-4.1.0-fast-math-i386-Os-workaround.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-workaround for lame stack packing on i386 ...
-
-       - build gcc with -Os (crtfastmath.o to be specific)
-       - crtfastmath.o is installed into gcc libdir
-       - run gcc with -ffast-math and get crtfastmath.o linked in
-       - resulting compiled app segfaults due to init code in
-         crtfastmath.o that has mis-aligned structure on stack
-
-http://bugs.gentoo.org/147020
-http://gcc.gnu.org/PR28621
-
-this is supposed to be fixed in current 4.1 branch, but i'm unable to get
-the fix to work so until i can figure out what i'm doing wrong, we'll use
-this workaround for now.
-
---- gcc-4.1.1/gcc/config/i386/crtfastmath.c
-+++ gcc-4.1.1/gcc/config/i386/crtfastmath.c
-@@ -37,6 +37,23 @@
- #define FXSAVE        (1 << 24)
- #define SSE   (1 << 25)
- 
-+struct
-+{
-+      unsigned short int cwd;
-+      unsigned short int swd;
-+      unsigned short int twd;
-+      unsigned short int fop;
-+      long int fip;
-+      long int fcs;
-+      long int foo;
-+      long int fos;
-+      long int mxcsr;
-+      long int mxcsr_mask;
-+      long int st_space[32];
-+      long int xmm_space[32];
-+      long int padding[56];
-+} __attribute__ ((aligned (16))) fxsave;
-+
- static void __attribute__((constructor))
- set_fast_math (void)
- {
-@@ -75,22 +92,6 @@
-       if (edx & FXSAVE)
-       {
-         /* Check if DAZ is available.  */
--        struct
--          {
--            unsigned short int cwd;
--            unsigned short int swd;
--            unsigned short int twd;
--            unsigned short int fop;
--            long int fip;
--            long int fcs;
--            long int foo;
--            long int fos;
--            long int mxcsr;
--            long int mxcsr_mask;
--            long int st_space[32];
--            long int xmm_space[32];
--            long int padding[56];
--          } __attribute__ ((aligned (16))) fxsave;
- 
-         __builtin_memset (&fxsave, 0, sizeof (fxsave));
- 

diff --git a/sys-devel/gcc/files/awk/fixlafiles.awk 
b/sys-devel/gcc/files/awk/fixlafiles.awk
deleted file mode 100644
index aa2ecb6..0000000
--- a/sys-devel/gcc/files/awk/fixlafiles.awk
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#
-# 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] = "/lib"
-       DIRLIST[2] = "/usr/lib"
-
-       #
-       # Walk /etc/ld.so.conf to discover all our library paths
-       #
-       pipe = "cat /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 = "/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 = "/usr/lib/gcc-lib/"
-       GCCLIBPREFIX_NEW = "/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/usr/" OLDCHOST 
"/",
-                                                            "-L/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 d95a3c0..0000000
--- a/sys-devel/gcc/files/awk/fixlafiles.awk-no_gcc_la
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#
-# 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 /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] = "/lib"
-       DIRLIST[2] = "/usr/lib"
-
-       #
-       # Walk /etc/ld.so.conf to discover all our library paths
-       #
-       parse_ld_conf("/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 = "/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 = "/usr/lib/gcc-lib/"
-       GCCLIBPREFIX_NEW = "/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/usr/" OLDCHOST 
"/",
-                                                            "-L/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/c89 b/sys-devel/gcc/files/c89
deleted file mode 100644
index cee0325..0000000
--- 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 100644
index c954209..0000000
--- 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 100644
index af085e1..0000000
--- a/sys-devel/gcc/files/fix_libtool_files.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
-
-. /etc/profile || exit 1
-
-if [ ${EUID:-0} -ne 0   -a   "${EPREFIX}" = '' ] ; then
-       echo "${0##*/}: Must be root."
-       exit 1
-fi
-
-# make sure the files come out sane
-umask 0022
-
-OLDCHOST=
-[ "${ARGV2}" = "--oldarch" ] && OLDCHOST=${ARGV3}
-
-AWKDIR="/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-4.9.4-bootstrap.patch 
b/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch
deleted file mode 100644
index aed1ad0..0000000
--- a/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 41a4aa66eac45c8862a79351647ec06dd03bd1f5 Mon Sep 17 00:00:00 2001
-From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Sat, 13 Dec 2014 11:24:37 +0000
-Subject: [PATCH]       PR bootstrap/64023      * Makefile.tpl
- (EXTRA_TARGET_FLAGS): Set STAGE1_LDFLAGS      to POSTSTAGE1_LDFLAGS and
- STAGE1_LIBS to POSTSTAGE1_LIBS.       Add -B to libstdc++-v3/src/.libs and
- libstdc++-v3/libsupc++/.libs  to CXX.         * Makefile.in: Regenerated.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@218705 
138bc75d-0d04-0410-961f-82ee72b054a4
----
- ChangeLog    | 9 +++++++++
- Makefile.in  | 6 +++++-
- Makefile.tpl | 6 +++++-
- 3 files changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index ba5ae4c2ecb..8ffc313f157 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -835,7 +835,9 @@ EXTRA_TARGET_FLAGS = \
-       'AS=$(COMPILER_AS_FOR_TARGET)' \
-       'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-       'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
--      'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-+      'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
-+       -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
-+       $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-       'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
-       'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
-       'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-@@ -853,6 +855,8 @@ EXTRA_TARGET_FLAGS = \
-       'WINDRES=$$(WINDRES_FOR_TARGET)' \
-       'WINDMC=$$(WINDMC_FOR_TARGET)' \
-       'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
-+      'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
-+      'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
-       "TFLAGS=$$TFLAGS"
- 
- TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
-diff --git a/Makefile.tpl b/Makefile.tpl
-index dcbc6b1b143..bb8227eaafa 100644
---- a/Makefile.tpl
-+++ b/Makefile.tpl
-@@ -641,7 +641,9 @@ EXTRA_TARGET_FLAGS = \
-       'AS=$(COMPILER_AS_FOR_TARGET)' \
-       'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-       'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
--      'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-+      'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \
-+       -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \
-+       $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-       'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \
-       'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
-       'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
-@@ -659,6 +661,8 @@ EXTRA_TARGET_FLAGS = \
-       'WINDRES=$$(WINDRES_FOR_TARGET)' \
-       'WINDMC=$$(WINDMC_FOR_TARGET)' \
-       'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \
-+      'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \
-+      'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \
-       "TFLAGS=$$TFLAGS"
- 
- TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
--- 
-2.15.0
-

diff --git a/sys-devel/gcc/files/gcc-configure-LANG.patch 
b/sys-devel/gcc/files/gcc-configure-LANG.patch
deleted file mode 100644
index d1b1b03..0000000
--- a/sys-devel/gcc/files/gcc-configure-LANG.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- configure
-+++ configure
-@@ -54,6 +54,19 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    unset $as_var
-+  fi
-+done
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
-@@ -1850,6 +1850,19 @@
- # Compiler output produced by configure, useful for debugging
- # configure, is in ./config.log if it exists.
- 
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval \$as_var=C; export \$as_var) 2>&1`"); then
-+    eval \$as_var=C; export \$as_var
-+  else
-+    unset \$as_var
-+  fi
-+done
-+
- ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
- for ac_option
- do

diff --git a/sys-devel/gcc/files/gcc-configure-texinfo.patch 
b/sys-devel/gcc/files/gcc-configure-texinfo.patch
deleted file mode 100644
index ddc098d..0000000
--- a/sys-devel/gcc/files/gcc-configure-texinfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Chances are quite good that the installed makeinfo is sufficient.
-So ignore false positives where the makeinfo installed is so new
-that it violates the cheesy version grep.
-
-http://bugs.gentoo.org/198182
-
---- configure
-+++ configure
-@@ -3573,6 +3573,6 @@
-       :
-     else
--      MAKEINFO="$MISSING makeinfo"
-+      :
-     fi
-     ;;
- 

diff --git a/sys-devel/gcc/files/gcc-spec-env-r1.patch 
b/sys-devel/gcc/files/gcc-spec-env-r1.patch
deleted file mode 100644
index a589268..0000000
--- a/sys-devel/gcc/files/gcc-spec-env-r1.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-2013-08-22  Magnus Granberg <[email protected]>
-
-       * gcc/gcc.c (main): Add support for external spec file via the 
GCC_SPECS env var
-       and move the process of the user specifed specs.
-
-    This allows us to easily control pie/ssp defaults with gcc-config profiles.
-    Original patch by Rob Holland
-    Extended to support multiple entries separated by ':' by Kevin F. Quinn
-    Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill
-    Modified to process the GCC_SPECS env var befor DRIVER_SELF_SPECS by 
Magnus Granberg
-
---- gcc-4.8-20130210/gcc/gcc.c 2013-02-05 16:55:31.000000000 +0100
-+++ gcc-4.8-20130210-work/gcc/gcc.c    2013-07-26 02:32:14.625089864 +0200
-@@ -6427,6 +6428,48 @@ main (int argc, char **argv)
-     do_option_spec (option_default_specs[i].name,
-                   option_default_specs[i].spec);
- 
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined 
(WIN32))
-+  /* Add specs listed in GCC_SPECS.  Note; in the process of separating
-+   * each spec listed, the string is overwritten at token boundaries
-+   * (':') with '\0', an effect of strtok_r().
-+   */
-+  specs_file = getenv ("GCC_SPECS");
-+  if (specs_file && (strlen(specs_file) > 0))
-+    {
-+      char *spec, *saveptr;
-+      for (spec=strtok_r(specs_file,":",&saveptr);
-+           spec!=NULL;
-+           spec=strtok_r(NULL,":",&saveptr))
-+        {
-+          struct user_specs *user = (struct user_specs *)
-+            xmalloc (sizeof (struct user_specs));
-+          user->next = (struct user_specs *) 0;
-+          user->filename = spec;
-+          if (user_specs_tail)
-+            user_specs_tail->next = user;
-+          else
-+            user_specs_head = user;
-+          user_specs_tail = user;
-+        }
-+    }
-+#endif
-+  /* Process any user specified specs in the order given on the command
-+   *     line.  */
-+  for (uptr = user_specs_head; uptr; uptr = uptr->next)
-+    {
-+      char *filename = find_a_file (&startfile_prefixes, uptr->filename,
-+        R_OK, true);
-+      read_specs (filename ? filename : uptr->filename, false, true);
-+    }
-+  /* Process any user self specs.  */
-+  {
-+    struct spec_list *sl;
-+    for (sl = specs; sl; sl = sl->next)
-+      if (sl->name_len == sizeof "self_spec" - 1
-+          && !strcmp (sl->name, "self_spec"))
-+        do_self_spec (*sl->ptr_spec);
-+  }
-+
-   /* Process DRIVER_SELF_SPECS, adding any new options to the end
-      of the command line.  */
- 
-@@ -6535,24 +6578,6 @@ main (int argc, char **argv)
-                             PREFIX_PRIORITY_LAST, 0, 1);
-     }
- 
--  /* Process any user specified specs in the order given on the command
--     line.  */
--  for (uptr = user_specs_head; uptr; uptr = uptr->next)
--    {
--      char *filename = find_a_file (&startfile_prefixes, uptr->filename,
--                                  R_OK, true);
--      read_specs (filename ? filename : uptr->filename, false, true);
--    }
--
--  /* Process any user self specs.  */
--  {
--    struct spec_list *sl;
--    for (sl = specs; sl; sl = sl->next)
--      if (sl->name_len == sizeof "self_spec" - 1
--        && !strcmp (sl->name, "self_spec"))
--      do_self_spec (*sl->ptr_spec);
--  }
--
-   if (compare_debug)
-     {
-       enum save_temps save;

diff --git a/sys-devel/gcc/files/gcc-spec-env.patch 
b/sys-devel/gcc/files/gcc-spec-env.patch
deleted file mode 100644
index 57e7567..0000000
--- a/sys-devel/gcc/files/gcc-spec-env.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-    Add support for external spec file via the GCC_SPECS env var.  This
-    allows us to easily control pie/ssp defaults with gcc-config profiles.
-
-    Original patch by Rob Holland
-    Extended to support multiple entries separated by ':' by Kevin F. Quinn
-    Modified to use getenv instead of poisoned GET_ENVIRONMENT by Ryan Hill
-
---- gcc-4/gcc/gcc.c
-+++ gcc-4/gcc/gcc.c
-@@ -6482,6 +6482,32 @@
- 
-   /* Process any user specified specs in the order given on the command
-      line.  */
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined 
(WIN32))
-+  /* Add specs listed in GCC_SPECS.  Note; in the process of separating
-+   * each spec listed, the string is overwritten at token boundaries
-+   * (':') with '\0', an effect of strtok_r().
-+   */
-+  specs_file = getenv ("GCC_SPECS");
-+  if (specs_file && (strlen(specs_file) > 0))
-+    {
-+      char *spec, *saveptr;
-+      for (spec=strtok_r(specs_file,":",&saveptr);
-+           spec!=NULL;
-+           spec=strtok_r(NULL,":",&saveptr))
-+        {
-+          struct user_specs *user = (struct user_specs *)
-+            xmalloc (sizeof (struct user_specs));
-+
-+          user->next = (struct user_specs *) 0;
-+          user->filename = spec;
-+          if (user_specs_tail)
-+            user_specs_tail->next = user;
-+          else
-+            user_specs_head = user;
-+          user_specs_tail = user;
-+        }
-+    }
-+#endif
-   for (uptr = user_specs_head; uptr; uptr = uptr->next)
-     {
-       char *filename = find_a_file (&startfile_prefixes, uptr->filename,

diff --git a/sys-devel/gcc/files/gdc-7-pgo.patch 
b/sys-devel/gcc/files/gdc-7-pgo.patch
deleted file mode 100644
index c9acf23..0000000
--- a/sys-devel/gcc/files/gdc-7-pgo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gcc/d/Make-lang.in 2017-09-30 00:27:44.232360842 +0200
-+++ gcc/d/Make-lang.in 2017-09-30 00:27:56.543360988 +0200
-@@ -309,10 +309,10 @@
- 
- # Generated programs.
- d/idgen: d/idgen.dmdgen.o
--      +$(LINKER_FOR_BUILD) $(BUILD_LINKER_FLAGS) $(BUILD_LDFLAGS) -o $@ $^
-+      +$(LINKER_FOR_BUILD) $(BUILD_LINKER_FLAGS) $(BUILD_LDFLAGS) -o $@ $^ 
-lgcov
- 
- d/impcvgen: d/impcnvgen.dmdgen.o
--      +$(LINKER_FOR_BUILD) $(BUILD_LINKER_FLAGS) $(BUILD_LDFLAGS) -o $@ $^
-+      +$(LINKER_FOR_BUILD) $(BUILD_LINKER_FLAGS) $(BUILD_LDFLAGS) -o $@ $^ 
-lgcov
- 
- # Generated sources.
- d/id.c: d/idgen

diff --git a/sys-devel/gcc/files/gdc-pgo.patch 
b/sys-devel/gcc/files/gdc-pgo.patch
deleted file mode 100644
index e14ecfc..0000000
--- a/sys-devel/gcc/files/gdc-pgo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gcc/d/Make-lang.in 2017-09-30 00:27:44.232360842 +0200
-+++ gcc/d/Make-lang.in 2017-09-30 00:27:56.543360988 +0200
-@@ -92,10 +92,10 @@
- 
- # Generated programs.
- d/idgen: d/idgen.dmdgen.o
--      +$(LINKER_FOR_BUILD) $(BUILD_LINKER_FLAGS) $(BUILD_LDFLAGS)  -o $@ $^
-+      +$(LINKER_FOR_BUILD) $(BUILD_LINKER_FLAGS) $(BUILD_LDFLAGS)  -o $@ $^ 
-lgcov
- 
- d/impcvgen: d/impcnvgen.dmdgen.o
--      +$(LINKER_FOR_BUILD) $(BUILD_LINKER_FLAGS) $(BUILD_LDFLAGS) -o $@ $^
-+      +$(LINKER_FOR_BUILD) $(BUILD_LINKER_FLAGS) $(BUILD_LDFLAGS) -o $@ $^ 
-lgcov
- 
- # Generated sources.
- d/id.c: d/idgen

diff --git a/sys-devel/gcc/gcc-6.4.0-r1.ebuild 
b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
deleted file mode 100644
index e266b0e..0000000
--- a/sys-devel/gcc/gcc-6.4.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.3"
-UCLIBC_VER="1.0"
-
-inherit toolchain
-
-KEYWORDS="amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       elibc_glibc? ( >=sys-libs/glibc-2.13 )
-       >=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-       PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
-
-IUSE="d"
-PDEPEND="${PDEPEND} d? ( ~dev-util/gdmd-${PV} )"
-SRC_URI="${SRC_URI}
-       
https://codeload.github.com/D-Programming-GDC/gdc-archived/tar.gz/v2.068.2_gcc6 
-> gdc-2.068.2_gcc-6.tar.gz"
-
-src_unpack() {
-       toolchain_src_unpack
-
-       use d && unpack gdc-2.068.2_gcc-6.tar.gz
-}
-
-src_prepare() {
-       toolchain_src_prepare
-
-       if use d ; then
-               # Get GDC sources into the tree.
-               cd ../gdc-archived-2.068.2_gcc6 || die "Changing into GDC 
directory failed."
-               use pgo && epatch "${FILESDIR}"/gdc-pgo.patch
-               ./setup-gcc.sh ../gcc-${GCC_PV} || die "Could not setup GDC."
-       fi
-}

diff --git a/sys-devel/gcc/gcc-7.3.0-r3.ebuild 
b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
deleted file mode 100644
index 7a1fa09..0000000
--- a/sys-devel/gcc/gcc-7.3.0-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.4"
-#UCLIBC_VER="1.0"
-
-inherit toolchain git-r3 eapi7-ver
-
-KEYWORDS="amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 
~ppc-macos"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-       elibc_glibc? ( >=sys-libs/glibc-2.13 )
-       >=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-       PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
-
-IUSE="d d-bootstrap"
-REQUIRED_USE="${REQUIRED_USE} d-bootstrap? ( d )"
-PDEPEND="${PDEPEND} d? ( ~dev-util/gdmd-${PV} )"
-EGIT_REPO_URI="https://github.com/D-Programming-GDC/gdc-archived.git";
-EGIT_CHECKOUT_DIR="${WORKDIR}/gdc-`ver_cut 1`"
-
-src_unpack() {
-       toolchain_src_unpack
-       if use d-bootstrap ; then
-               EGIT_BRANCH="gdc-`ver_cut 1`-stable"
-       else
-               EGIT_BRANCH="gdc-`ver_cut 1`"
-               EGIT_COMMIT="95a735b5441d7d72578c0ceeb95aa753bfcd928b"
-       fi
-       git-r3_src_unpack
-}
-
-src_prepare() {
-       toolchain_src_prepare
-
-       if use d ; then
-               # Get GDC sources into the tree.
-               cd "${EGIT_CHECKOUT_DIR}" || die "Changing into GDC directory 
failed."
-               use d-bootstrap && use pgo && epatch "${FILESDIR}"/gdc-`ver_cut 
1`-pgo.patch
-               ./setup-gcc.sh ../gcc-${GCC_PV} || die "Could not setup GDC."
-       fi
-}

diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
deleted file mode 100644
index f384eb8..0000000
--- a/sys-devel/gcc/metadata.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-  <maintainer type="project">
-    <email>[email protected]</email>
-    <name>Gentoo Toolchain Project</name>
-  </maintainer>
-  <use>
-    <flag name="awt">Useful only when building GCJ, this enables Abstract 
Window Toolkit
-      (AWT) peer support on top of GTK+</flag>
-    <flag name="cilk">Support the Cilk Plus language (C/C++ based languages 
for parallel programming)</flag>
-    <flag name="d">Enable support for the D programming language</flag>
-    <flag name="d-bootstrap">Build an ancient C++ based D compiler for 
bootstrapping</flag>
-    <flag name="fixed-point">Enable fixed-point arithmetic support for MIPS 
targets 
-      in gcc (Warning: significantly increases compile time!)</flag>
-    <flag name="gcj">Build the GCJ Java language frontend.</flag>
-    <flag name="go">Build the GCC Go language frontend.</flag>
-    <flag name="graphite">Add support for the framework for loop
-      optimizations based on a polyhedral intermediate representation</flag>
-    <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="nptl">Enable support for Native POSIX Threads Library, the new 
threading module (requires linux-2.6 or better usually)</flag>
-    <flag name="objc">Build support for the Objective C code language</flag>
-    <flag name="objc++">Build support for the Objective C++ language</flag>
-    <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="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="vtv">Build support for virtual table verification (a C++ 
hardening feature)</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:gnu:gcc</remote-id>
-    <remote-id type="sourceforge">dgcc</remote-id>
-  </upstream>
-</pkgmetadata>

Reply via email to