Updated esp.h in the patchset 0.4.1

6 files changed, 20 insertions, 20 deletions

diff --git a/gcc-4.4.3/piepatch/30_all_gcc44_esp.h.patch b/gcc-4.4.3/piepatch/30_all_gcc44_esp.h.patch
index 8e6e8a3..1abec0b 100644
--- a/gcc-4.4.3/piepatch/30_all_gcc44_esp.h.patch
+++ b/gcc-4.4.3/piepatch/30_all_gcc44_esp.h.patch
@@ -1,13 +1,13 @@
-2010-04-22		Magnus Granberg		<zorry@gentoo.org>
+2010-04-29		Magnus Granberg		<zorry@gentoo.org>
 
 		* gcc/esp.h	New file to support --enable-esp
-		Version 20100422.1
+		Version 20100429.1
 
 --- gcc/esp.h	2010-04-09 16:14:00.000000000 +0200
-+++ gcc/esp.h	2010-04-22 13:48:18.000000000 +0200
++++ gcc/esp.h	2010-04-29 21:30:47.000000000 +0200
 @@ -0,0 +1,147 @@
 +/* License terms see GNU GENERAL PUBLIC LICENSE Version 3.
-+ * Version 20100422.1
++ * Version 20100429.1
 + * Magnus Granberg (Zorry) <zorry@gentoo.org>  */
 +#ifndef GCC_ESP_H
 +#define GCC_ESP_H
@@ -42,7 +42,10 @@
 +	/*	ESP_LINK_SPEC is added to LINK_PIE_SPEC if esp is enable
 +		-z now will be added if we don't have -vanilla spec  */
 +	#define ESP_LINK_SPEC "%(esp_link_now)"
-+	#define ESP_LINK_NOW_SPEC "%{!nonow:-z now}"
++	#define ESP_LINK_NOW_SPEC "%{!now:-z now}"
++
++	/*	We use ESP_COMMAND_OPTIONS_SPEC to add pie command-line options.  */
++	#define ESP_COMMAND_OPTIONS_SPEC "%{!D__KERNEL__:%{!nopie:%(esp_options_pie) %(esp_link_pie)}}"
 +	
 +	/*	ESP_OPTIONS_SPEC is added to the compiler spec in gcc/gcc.c  */
 +	#define ESP_OPTIONS_SPEC "%(esp_options_ssp)"
@@ -64,9 +67,6 @@
 +	/* If HAVE_GCC_LD_PIE not defined we will not add any -fPIE -pie  */
 +	#ifdef HAVE_GCC_LD_PIE
 +
-+		/*	We use ESP_COMMAND_OPTIONS_SPEC to add pie command-line options.  */
-+		#define ESP_COMMAND_OPTIONS_SPEC "%{!D__KERNEL__:%{!nopie:%(esp_options_pie) %(esp_link_pie)}}"
-+
 +		/*  This will add -fPIE if we don't have -pie -fpic -fPIC -fpie -fPIE -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static
 +			-nostdlib -nostartfiles.  */
 +		/*  With ENABLE_CRTBEGINTS we don't need to check for -static  */
diff --git a/gcc-4.4.3/piepatch/README.Changelog b/gcc-4.4.3/piepatch/README.Changelog
index 2d63248..e96e077 100644
--- a/gcc-4.4.3/piepatch/README.Changelog
+++ b/gcc-4.4.3/piepatch/README.Changelog
@@ -10,7 +10,7 @@
 		* gcc/config.in					Added HAVE_GCC_LD_PIE
 		*gcc/Makefile.in				renamed enable_esp to enable_esp_set
 		*gcc/esp						Renamed HAVE_LD_PIE to HAVE_GCC_LD_PIE
-		Added HAVE_GCC_LD_PIE to #define ESP_CC1_PIE_SPEC.
+		Added HAVE_GCC_LD_PIE to #define ESP_CC1_PIE_SPEC. Move ESP_COMMAND_OPTIONS_SPEC
 		* libmudflap/Makefiles.in		In enable_esp change ifeq to ifdef.
 
 		#293843 b.g.o
diff --git a/gcc-4.4.3/piepatch/README.history b/gcc-4.4.3/piepatch/README.history
index 86339a8..f9d9f95 100644
--- a/gcc-4.4.3/piepatch/README.history
+++ b/gcc-4.4.3/piepatch/README.history
@@ -1,4 +1,4 @@
-0.4.1		23-04-2010
+0.4.1		29-04-2010
 		U 10_all_gcc44_configure.patch
 		U 12_all_gcc44_Makefile.in.patch
 		U 11_all_gcc44_config.in.patch
diff --git a/gcc-4.5.0/piepatch/30_all_gcc44_esp.h.patch b/gcc-4.5.0/piepatch/30_all_gcc44_esp.h.patch
index 8e6e8a3..1abec0b 100644
--- a/gcc-4.5.0/piepatch/30_all_gcc44_esp.h.patch
+++ b/gcc-4.5.0/piepatch/30_all_gcc44_esp.h.patch
@@ -1,13 +1,13 @@
-2010-04-22		Magnus Granberg		<zorry@gentoo.org>
+2010-04-29		Magnus Granberg		<zorry@gentoo.org>
 
 		* gcc/esp.h	New file to support --enable-esp
-		Version 20100422.1
+		Version 20100429.1
 
 --- gcc/esp.h	2010-04-09 16:14:00.000000000 +0200
-+++ gcc/esp.h	2010-04-22 13:48:18.000000000 +0200
++++ gcc/esp.h	2010-04-29 21:30:47.000000000 +0200
 @@ -0,0 +1,147 @@
 +/* License terms see GNU GENERAL PUBLIC LICENSE Version 3.
-+ * Version 20100422.1
++ * Version 20100429.1
 + * Magnus Granberg (Zorry) <zorry@gentoo.org>  */
 +#ifndef GCC_ESP_H
 +#define GCC_ESP_H
@@ -42,7 +42,10 @@
 +	/*	ESP_LINK_SPEC is added to LINK_PIE_SPEC if esp is enable
 +		-z now will be added if we don't have -vanilla spec  */
 +	#define ESP_LINK_SPEC "%(esp_link_now)"
-+	#define ESP_LINK_NOW_SPEC "%{!nonow:-z now}"
++	#define ESP_LINK_NOW_SPEC "%{!now:-z now}"
++
++	/*	We use ESP_COMMAND_OPTIONS_SPEC to add pie command-line options.  */
++	#define ESP_COMMAND_OPTIONS_SPEC "%{!D__KERNEL__:%{!nopie:%(esp_options_pie) %(esp_link_pie)}}"
 +	
 +	/*	ESP_OPTIONS_SPEC is added to the compiler spec in gcc/gcc.c  */
 +	#define ESP_OPTIONS_SPEC "%(esp_options_ssp)"
@@ -64,9 +67,6 @@
 +	/* If HAVE_GCC_LD_PIE not defined we will not add any -fPIE -pie  */
 +	#ifdef HAVE_GCC_LD_PIE
 +
-+		/*	We use ESP_COMMAND_OPTIONS_SPEC to add pie command-line options.  */
-+		#define ESP_COMMAND_OPTIONS_SPEC "%{!D__KERNEL__:%{!nopie:%(esp_options_pie) %(esp_link_pie)}}"
-+
 +		/*  This will add -fPIE if we don't have -pie -fpic -fPIC -fpie -fPIE -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static
 +			-nostdlib -nostartfiles.  */
 +		/*  With ENABLE_CRTBEGINTS we don't need to check for -static  */
diff --git a/gcc-4.5.0/piepatch/README.Changelog b/gcc-4.5.0/piepatch/README.Changelog
index af550e8..7a2adad 100644
--- a/gcc-4.5.0/piepatch/README.Changelog
+++ b/gcc-4.5.0/piepatch/README.Changelog
@@ -10,7 +10,7 @@
 		* gcc/config.in					Added HAVE_GCC_LD_PIE
 		*gcc/Makefile.in				renamed enable_esp to enable_esp_set
 		*gcc/esp						Renamed HAVE_LD_PIE to HAVE_GCC_LD_PIE
-		Added HAVE_GCC_LD_PIE to #define ESP_CC1_PIE_SPEC.
+		Added HAVE_GCC_LD_PIE to #define ESP_CC1_PIE_SPEC. Move ESP_COMMAND_OPTIONS_SPEC
 		* libmudflap/Makefiles.in		In enable_esp change ifeq to ifdef.
 
 		#293843 b.g.o
diff --git a/gcc-4.5.0/piepatch/README.history b/gcc-4.5.0/piepatch/README.history
index 1238f54..1c3423f 100644
--- a/gcc-4.5.0/piepatch/README.history
+++ b/gcc-4.5.0/piepatch/README.history
@@ -1,4 +1,4 @@
-0.4.1		23-04-2010
+0.4.1		29-04-2010
 		+ 00_all_gcc45-trampolinwarn.patch
 		U 10_all_gcc45_configure.patch
 		U 12_all_gcc45_Makefile.in.patch