sys-devel/gcc: remove unused patches

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19654
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

10 files changed, 0 insertions, 493 deletions

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 507d42f00e90..000000000000
--- 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 b5195e4e9112..000000000000
--- 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 b270a06ad80d..000000000000
--- 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 03895434d9ba..000000000000
--- 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 523caa48a3c8..000000000000
--- 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 6090d66d132d..000000000000
--- 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/gcc-4.9.4-bootstrap.patch b/sys-devel/gcc/files/gcc-4.9.4-bootstrap.patch
deleted file mode 100644
index aed1ad0e90be..000000000000
--- 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-9.2.0-neg-insn-cost.patch b/sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch
deleted file mode 100644
index 7a6bebdf4905..000000000000
--- a/sys-devel/gcc/files/gcc-9.2.0-neg-insn-cost.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/707958
-https://gcc.gnu.org/PR88879
-
-Subject: [PATCH] sel-sched: allow negative insn priority (PR 88879)
-From: Alexander Monakov <amonakov@ispras.ru>
-
-	PR rtl-optimization/88879
-	* sel-sched.c (sel_target_adjust_priority): Remove assert.
-
-From-SVN: r271039
----
- gcc/ChangeLog   | 5 +++++
- gcc/sel-sched.c | 2 --
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
---- a/gcc/sel-sched.c
-+++ b/gcc/sel-sched.c
-@@ -3331,8 +3331,6 @@ sel_target_adjust_priority (expr_t expr)
-   else
-     new_priority = priority;
- 
--  gcc_assert (new_priority >= 0);
--
-   /* If the priority has changed, adjust EXPR_PRIORITY_ADJ accordingly.  */
-   EXPR_PRIORITY_ADJ (expr) = new_priority - EXPR_PRIORITY (expr);
- 
--- 
-2.25.0
-
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 a58926836e4e..000000000000
--- a/sys-devel/gcc/files/gcc-spec-env-r1.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-2013-08-22  Magnus Granberg <zorry@gentoo.org>
-
-	* 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 57e7567e5460..000000000000
--- 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,