Scrub patches.

4 files changed, 7 insertions, 29 deletions

diff --git a/4.8.3/gentoo/09_all_default-ssp.patch b/4.8.3/gentoo/09_all_default-ssp.patch
index 6ed1678..903e649 100644
--- a/4.8.3/gentoo/09_all_default-ssp.patch
+++ b/4.8.3/gentoo/09_all_default-ssp.patch
@@ -4,8 +4,8 @@
 	# 484714
 	We Add -fstack-protector as default
 
---- a/configure.ac	2013-02-05 23:36:20.000000000 +0100
-+++ b/configure.ac	2013-12-30 22:22:47.241772166 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -3238,6 +3238,9 @@ case $build in
      esac ;;
  esac
@@ -16,8 +16,8 @@
  AC_SUBST(stage1_cflags)
  
  # Enable --enable-checking in stage1 of the compiler.
---- a/configure	2013-02-05 23:36:20.000000000 +0100
-+++ b/configure	2013-12-30 22:57:04.301738428 +0100
+--- a/configure
++++ b/configure
 @@ -14453,7 +14453,8 @@ case $build in
      esac ;;
  esac
@@ -28,8 +28,8 @@
  
  # Enable --enable-checking in stage1 of the compiler.
  # Check whether --enable-stage1-checking was given.
---- a/Makefile.in	2013-01-14 17:15:21.000000000 +0100
-+++ b/Makefile.in	2013-12-30 22:26:24.381768605 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -362,7 +362,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
  
  # Flags to pass to stage2 and later makes.  They are defined
@@ -52,7 +52,7 @@
  
  TFLAGS =
 --- a/gcc/doc/invoke.texi 2009-12-21
-+++ b/gcc/doc/invoke.texi	2009-12-21
++++ b/gcc/doc/invoke.texi
 @@ -8111,6 +8111,10 @@
  when a function is entered and then checked when the function exits.
  If a guard check fails, an error message is printed and the program exits.
diff --git a/4.8.3/gentoo/30_all_arm_armv4-no-thumb-fix-link.patch b/4.8.3/gentoo/30_all_arm_armv4-no-thumb-fix-link.patch
index 3cbd216..69d1558 100644
--- a/4.8.3/gentoo/30_all_arm_armv4-no-thumb-fix-link.patch
+++ b/4.8.3/gentoo/30_all_arm_armv4-no-thumb-fix-link.patch
@@ -36,8 +36,6 @@ Signed-off-by: Mike Frysinger <vapier@gentoo.org>
  gcc/config/arm/linux-eabi.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h
-index 4a425c8..8b7ebb2 100644
 --- a/gcc/config/arm/linux-eabi.h
 +++ b/gcc/config/arm/linux-eabi.h
 @@ -80,7 +80,7 @@
diff --git a/4.8.3/gentoo/67_all_gcc-poison-system-directories.patch b/4.8.3/gentoo/67_all_gcc-poison-system-directories.patch
index dd20ff2..9b463e2 100644
--- a/4.8.3/gentoo/67_all_gcc-poison-system-directories.patch
+++ b/4.8.3/gentoo/67_all_gcc-poison-system-directories.patch
@@ -19,8 +19,6 @@ Upstream-Status: Inappropriate [distribution: codesourcery]
  gcc/incpath.c       |   19 +++++++++++++++++++
  8 files changed, 69 insertions(+), 3 deletions(-)
 
-diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index 54ea04f..90a2bba 100644
 --- a/gcc/Makefile.in
 +++ b/gcc/Makefile.in
 @@ -2018,7 +2018,7 @@ attribs.o : attribs.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) \
@@ -32,8 +30,6 @@ index 54ea04f..90a2bba 100644
  
  CFLAGS-prefix.o += -DPREFIX=\"$(prefix)\" -DBASEVER=$(BASEVER_s)
  prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h prefix.h \
-diff --git a/gcc/common.opt b/gcc/common.opt
-index bdbd3b6..ab86b00 100644
 --- a/gcc/common.opt
 +++ b/gcc/common.opt
 @@ -595,6 +595,10 @@ Wpedantic
@@ -47,8 +43,6 @@ index bdbd3b6..ab86b00 100644
  Wshadow
  Common Var(warn_shadow) Warning
  Warn when one local variable shadows another
-diff --git a/gcc/config.in b/gcc/config.in
-index d80fb9f..0524af7 100644
 --- a/gcc/config.in
 +++ b/gcc/config.in
 @@ -138,6 +138,12 @@
@@ -64,8 +58,6 @@ index d80fb9f..0524af7 100644
  /* Define if you want all operations on RTL (the basic data structure of the
     optimizer and back end) to be checked for dynamic type safety at runtime.
     This is quite expensive. */
-diff --git a/gcc/configure b/gcc/configure
-index 135bbf5..b65d21d 100755
 --- a/gcc/configure
 +++ b/gcc/configure
 @@ -917,6 +917,7 @@ with_gc
@@ -105,8 +97,6 @@ index 135bbf5..b65d21d 100755
  # Substitute configuration variables
  
  
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 6363a21..e226b85 100644
 --- a/gcc/configure.ac
 +++ b/gcc/configure.ac
 @@ -5063,6 +5063,16 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
@@ -126,8 +116,6 @@ index 6363a21..e226b85 100644
  # Substitute configuration variables
  AC_SUBST(subdirs)
  AC_SUBST(srcdir)
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 9273d7d..a022622 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
 @@ -258,6 +258,7 @@ Objective-C and Objective-C++ Dialects}.
@@ -153,8 +141,6 @@ index 9273d7d..a022622 100644
  @item -Wfloat-equal
  @opindex Wfloat-equal
  @opindex Wno-float-equal
-diff --git a/gcc/gcc.c b/gcc/gcc.c
-index 86077f8..efdb625 100644
 --- a/gcc/gcc.c
 +++ b/gcc/gcc.c
 @@ -740,6 +740,8 @@ proper position among the other output files.  */
@@ -166,8 +152,6 @@ index 86077f8..efdb625 100644
      %{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\
      %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\
      %{fgnu-tm:%:include(libitm.spec)%(link_itm)}\
-diff --git a/gcc/incpath.c b/gcc/incpath.c
-index 018da98..cd41c78 100644
 --- a/gcc/incpath.c
 +++ b/gcc/incpath.c
 @@ -28,6 +28,7 @@
diff --git a/4.8.3/gentoo/92_all_freebsd-pie.patch b/4.8.3/gentoo/92_all_freebsd-pie.patch
index 4905db7..ca49b35 100644
--- a/4.8.3/gentoo/92_all_freebsd-pie.patch
+++ b/4.8.3/gentoo/92_all_freebsd-pie.patch
@@ -13,8 +13,6 @@ gcc/config/i386/freebsd.h: Likewise.
  gcc/config/i386/freebsd.h |    9 +++------
  2 files changed, 6 insertions(+), 12 deletions(-)
 
-diff --git a/gcc/config/freebsd-spec.h b/gcc/config/freebsd-spec.h
-index 770a3d1..2808582 100644
 --- a/gcc/config/freebsd-spec.h
 +++ b/gcc/config/freebsd-spec.h
 @@ -64,11 +64,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
@@ -40,8 +38,6 @@ index 770a3d1..2808582 100644
  
  /* Provide a LIB_SPEC appropriate for FreeBSD as configured and as
     required by the user-land thread model.  Before __FreeBSD_version
-diff --git a/gcc/config/i386/freebsd.h b/gcc/config/i386/freebsd.h
-index 649274d..dd69e43 100644
 --- a/gcc/config/i386/freebsd.h
 +++ b/gcc/config/i386/freebsd.h
 @@ -67,11 +67,8 @@ along with GCC; see the file COPYING3.  If not see