4.9.4/pie: make all patches -p1 appliable

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

6 files changed, 18 insertions, 11 deletions

diff --git a/4.9.4/pie/02_all_gcc48_config.in.patch b/4.9.4/pie/02_all_gcc48_config.in.patch
index 3b4747b..657e593 100644
--- a/4.9.4/pie/02_all_gcc48_config.in.patch
+++ b/4.9.4/pie/02_all_gcc48_config.in.patch
@@ -2,8 +2,8 @@
 
 		* gcc/config.in	Add ENABLE_CRTBEGINP, ENABLE_ESP
 
---- gcc/config.in	2009-04-21 11:08:08.000000000 +0200
-+++ gcc/config.in	2009-05-12 00:10:08.000000000 +0200
+--- a/gcc/config.in	2009-04-21 11:08:08.000000000 +0200
++++ b/gcc/config.in	2009-05-12 00:10:08.000000000 +0200
 @@ -46,6 +46,12 @@
  #endif
  
diff --git a/4.9.4/pie/05_all_gcc48_gcc.c.patch b/4.9.4/pie/05_all_gcc48_gcc.c.patch
index ddfcafd..debf723 100644
--- a/4.9.4/pie/05_all_gcc48_gcc.c.patch
+++ b/4.9.4/pie/05_all_gcc48_gcc.c.patch
@@ -3,8 +3,8 @@
 		* gcc/gcc.c								include esp.h
 		static const char *cc1_spec 			We set that in esp.h if ENABLE_ESP.
 
---- gcc/gcc.c	2010-01-21 10:29:30.000000000 -0500
-+++ gcc/gcc.c	2010-01-29 23:29:16.000000000 -0500
+--- a/gcc/gcc.c	2010-01-21 10:29:30.000000000 -0500
++++ b/gcc/gcc.c	2010-01-29 23:29:16.000000000 -0500
 @@ -44,6 +44,7 @@
  #include "opts.h"
  #include "params.h"
diff --git a/4.9.4/pie/16_all_gcc47_nopie_option.patch b/4.9.4/pie/16_all_gcc47_nopie_option.patch
index ed9a961..e76ddf1 100644
--- a/4.9.4/pie/16_all_gcc47_nopie_option.patch
+++ b/4.9.4/pie/16_all_gcc47_nopie_option.patch
@@ -3,7 +3,7 @@
 		* gcc/common.opt		Add -nopie
 
 --- a/gcc/common.opt	2011-11-23 19:51:17.000000000 +0100
-+++ b//gcc/common.opt	2012-01-24 16:56:24.302224357 +0100
++++ b/gcc/common.opt	2012-01-24 16:56:24.302224357 +0100
 @@ -2280,6 +2280,9 @@ Driver
  nodefaultlibs
  Driver
diff --git a/4.9.4/pie/20_all_gcc49_config_crtbeginp.patch b/4.9.4/pie/20_all_gcc49_config_crtbeginp.patch
index 4bd5c18..62474c0 100644
--- a/4.9.4/pie/20_all_gcc49_config_crtbeginp.patch
+++ b/4.9.4/pie/20_all_gcc49_config_crtbeginp.patch
@@ -3,8 +3,8 @@
 		* gcc/config/gnu-user.h			If ENABLE_CRTBEGINP, -static and -pie use crtbegineP.o.
 		* gcc/config/rs6000/sysv4.h		If ENABLE_CRTBEGINP, -static and -pie use crtbegineP.o.
 
---- gcc/config/gnu-user.h	2014-01-02 23:23:26.000000000 +0100
-+++ gcc/config/gnu-user.h	2014-04-23 00:55:06.390265454 +0200
+--- a/gcc/config/gnu-user.h	2014-01-02 23:23:26.000000000 +0100
++++ b/gcc/config/gnu-user.h	2014-04-23 00:55:06.390265454 +0200
 @@ -40,7 +40,15 @@ see the files COPYING3 and COPYING.RUNTI
     provides part of the support for getting C++ file-scope static
     object constructed before entering `main'.  */
@@ -22,8 +22,8 @@
  #define GNU_USER_TARGET_STARTFILE_SPEC \
    "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
     crti.o%s %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s} \
---- gcc/config/rs6000/sysv4.h	2009-04-10 01:23:07.000000000 +0200
-+++ gcc/config/rs6000/sysv4.h	2009-09-08 04:41:50.000000000 +0200
+--- a/gcc/config/rs6000/sysv4.h	2009-04-10 01:23:07.000000000 +0200
++++ b/gcc/config/rs6000/sysv4.h	2009-09-08 04:41:50.000000000 +0200
 @@ -883,7 +883,12 @@
  %{!mnewlib: %{pthread:-lpthread} %{shared:-lc} \
  %{!shared: %{profile:-lc_p} %{!profile:-lc}}}"
diff --git a/4.9.4/pie/24_all_gcc49_invoke.texi.patch b/4.9.4/pie/24_all_gcc49_invoke.texi.patch
index cdda379..19d089c 100644
--- a/4.9.4/pie/24_all_gcc49_invoke.texi.patch
+++ b/4.9.4/pie/24_all_gcc49_invoke.texi.patch
@@ -3,8 +3,8 @@
 		* gcc/doc/invoke.texi	Add NOTES about -fstack-protector-all, -pie and
 		-fPIE/-fpie when --enable-esp is enable, this options is on by default.
 
---- gcc/doc/invoke.texi	2009-04-01 09:18:47.000000000 +0200
-+++ gcc/doc/invoke.texi	2009-06-18 14:08:38.000000000 +0200
+--- a/gcc/doc/invoke.texi	2009-04-01 09:18:47.000000000 +0200
++++ b/gcc/doc/invoke.texi	2009-06-18 14:08:38.000000000 +0200
 @@ -9233,6 +9245,11 @@ If a guard check fails, an error message
  @opindex fstack-protector-all
  Like @option{-fstack-protector} except that all functions are protected.
diff --git a/4.9.4/pie/README.history b/4.9.4/pie/README.history
index d095ef5..9f22978 100644
--- a/4.9.4/pie/README.history
+++ b/4.9.4/pie/README.history
@@ -1,3 +1,10 @@
+1		TODO
+		U 02_all_gcc48_config.in.patch
+		U 05_all_gcc48_gcc.c.patch
+		U 16_all_gcc47_nopie_option.patch
+		U 20_all_gcc49_config_crtbeginp.patch
+		U 24_all_gcc49_invoke.texi.patch
+
 0.6.4		27 Oct 2015
 		U 24_all_gcc49_invoke.texi.patch
 0.6.3		29 Aug 2015