From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 19 Feb 2011 13:24:57 +0000 (+0100)
Subject: Revert "gcc: Update PIE patches."
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=046a3c18d70a649eea8ccaff378c29f95a4e829a;p=ipfire-3.x.git

Revert "gcc: Update PIE patches."

This reverts commit 1b231184422d400769902dff5e34890ec0024bb4.

Conflicts:

	pkgs/core/gcc/gcc.nm
---

diff --git a/pkgs/core/gcc/gcc.nm b/pkgs/core/gcc/gcc.nm
index 2fbc8b36a..145ad4e93 100644
--- a/pkgs/core/gcc/gcc.nm
+++ b/pkgs/core/gcc/gcc.nm
@@ -26,7 +26,7 @@ include $(PKGROOT)/Include
 
 PKG_NAME       = gcc
 PKG_VER        = 4.5.2
-PKG_REL        = 5
+PKG_REL        = 6
 
 PKG_MAINTAINER = Michael Tremer <michael.tremer@ipfire.org>
 PKG_GROUP      = Development/Compilers
diff --git a/pkgs/core/gcc/patches/gcc-4.5.0-piepatches-20110218.patch0 b/pkgs/core/gcc/patches/gcc-4.5.0-piepatches-20100421.patch
similarity index 66%
rename from pkgs/core/gcc/patches/gcc-4.5.0-piepatches-20110218.patch0
rename to pkgs/core/gcc/patches/gcc-4.5.0-piepatches-20100421.patch
index 1a4c4ea29..e525d5bc2 100644
--- a/pkgs/core/gcc/patches/gcc-4.5.0-piepatches-20110218.patch0
+++ b/pkgs/core/gcc/patches/gcc-4.5.0-piepatches-20100421.patch
@@ -1,15 +1,6 @@
-2010-05-25	Magnus Granberg		<zorry@gentoo.org>, Anthony G. Basile	<basile@opensource.dyc.edu>
-
-		* configure		Add --enable-esp.  Add-fno-stack-protector
-		to stage1_cflags.
-		* gcc/configure		Add --enable-esp. Check -z now and -z relro.
-		Define ENABLE_ESP.
-		Check if we support crtbeginTS and define ENABLE_CRTBEGINTS.
-		* libmudflap/configure		Add AC_SUBST enable_esp.
-
-
---- configure	2010-01-31 13:12:21.000000000 -0500
-+++ configure	2010-02-07 14:29:51.000000000 -0500
+diff -Nur gcc-4.5.0-vanilla/configure gcc-4.5.0/configure
+--- gcc-4.5.0-vanilla/configure	2010-04-02 19:35:47.000000000 +0200
++++ gcc-4.5.0/configure	2010-04-21 15:21:09.762948361 +0200
 @@ -707,6 +707,7 @@
  CFLAGS
  CC
@@ -18,19 +9,19 @@
  host_subdir
  build_subdir
  build_libsubdir
-@@ -934,6 +934,11 @@
+@@ -1485,6 +1486,11 @@
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --enable-gold           use gold instead of ld
    --enable-libada         build libada directory
 +  --enable-esp
-+			   Enable Stack protector, Position independent executable as
-+			   default if we have suppot for it when compiling
++			   Enable Stack protector, Position independent executable and
++			   Fortify_sources as default if we have suppot for it when compiling
 +			   and link with -z relro and -z now as default.
-+			   Linux targets supported i*86, x86_64, powerpc, powerpc64, ia64 and arm
++			   Linux targets supported i*86, x86_64, powerpc*, ia64, arm* and mips
    --enable-libssp         build libssp directory
+   --enable-build-with-cxx build with C++ compiler instead of C compiler
    --disable-ppl-version-check    disable check for PPL version
-   --disable-cloog-version-check  disable check for CLooG version
-@@ -2145,6 +2150,25 @@
+@@ -3164,6 +3170,24 @@
    noconfigdirs="$noconfigdirs gnattools"
  fi
  
@@ -40,7 +31,7 @@
 +  enableval="$enable_esp"
 +
 +  case $target in
-+    i?86*-*-linux* | x86_64*-*-linux* | powerpc-*-linux* | powerpc64-*-linux* | arm*-*-linux* | ia64-*-linux*)
++    i?86*-*-linux* | x86_64*-*-linux* | powerpc-*-linux* | powerpc64-*-linux* | arm*-*-linux* | ia64-*-linux* | mips-*-linux*)
 +      enable_esp=yes
 +      ;;
 +    *)
@@ -51,12 +42,11 @@
 +  esac
 +
 +fi;
-+
 +
  # Check whether --enable-libssp was given.
  if test "${enable_libssp+set}" = set; then :
    enableval=$enable_libssp; ENABLE_LIBSSP=$enableval
-@@ -14266,6 +14290,9 @@
+@@ -14290,6 +14314,9 @@
        *) stage1_cflags="-g -J" ;;
      esac ;;
  esac
@@ -66,8 +56,177 @@
  
  # This is aimed to mimic bootstrap with a non-GCC compiler to catch problems.
  if test "$GCC" = yes -a "$ENABLE_BUILD_WITH_CXX" != yes; then
---- gcc/configure	2010-01-31 10:01:53.000000000 -0500
-+++ gcc/configure	2010-02-07 14:29:56.000000000 -0500
+diff -Nur gcc-4.5.0-vanilla/gcc/config/i386/linux64.h gcc-4.5.0/gcc/config/i386/linux64.h
+--- gcc-4.5.0-vanilla/gcc/config/i386/linux64.h	2010-03-24 21:44:48.000000000 +0100
++++ gcc-4.5.0/gcc/config/i386/linux64.h	2010-04-21 15:21:16.730815972 +0200
+@@ -115,7 +115,7 @@
+ /* This macro may be overridden in i386/k*bsd-gnu.h.  */
+ #define REG_NAME(reg) reg
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* i386 glibc provides __stack_chk_guard in %gs:0x14,
+    x86_64 glibc provides it in %fs:0x28.  */
+ #define TARGET_THREAD_SSP_OFFSET	(TARGET_64BIT ? 0x28 : 0x14)
+diff -Nur gcc-4.5.0-vanilla/gcc/config/i386/linux.h gcc-4.5.0/gcc/config/i386/linux.h
+--- gcc-4.5.0-vanilla/gcc/config/i386/linux.h	2010-03-24 21:44:48.000000000 +0100
++++ gcc-4.5.0/gcc/config/i386/linux.h	2010-04-21 15:21:16.721813554 +0200
+@@ -212,7 +212,7 @@
+ /* This macro may be overridden in i386/k*bsd-gnu.h.  */
+ #define REG_NAME(reg) reg
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* i386 glibc provides __stack_chk_guard in %gs:0x14.  */
+ #define TARGET_THREAD_SSP_OFFSET	0x14
+ #endif
+diff -Nur gcc-4.5.0-vanilla/gcc/config/linux.h gcc-4.5.0/gcc/config/linux.h
+--- gcc-4.5.0-vanilla/gcc/config/linux.h	2009-04-09 17:00:19.000000000 +0200
++++ gcc-4.5.0/gcc/config/linux.h	2010-04-21 15:21:16.667815357 +0200
+@@ -43,7 +43,11 @@
+    object constructed before entering `main'.  */
+    
+ #undef	STARTFILE_SPEC
+-#if defined HAVE_LD_PIE
++#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS)
++#define STARTFILE_SPEC \
++  "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} crti.o%s \
++   %{static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
++#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS)
+ #define 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}"
+diff -Nur gcc-4.5.0-vanilla/gcc/config/rs6000/linux64.h gcc-4.5.0/gcc/config/rs6000/linux64.h
+--- gcc-4.5.0-vanilla/gcc/config/rs6000/linux64.h	2010-03-17 05:44:37.000000000 +0100
++++ gcc-4.5.0/gcc/config/rs6000/linux64.h	2010-04-21 15:21:16.732816308 +0200
+@@ -162,7 +162,7 @@
+ #endif
+ 
+ #define ASM_SPEC32 "-a32 %{n} %{T} %{Ym,*} %{Yd,*} \
+-%{mrelocatable} %{mrelocatable-lib} %{fpic:-K PIC} %{fPIC:-K PIC} \
++%{mrelocatable} %{mrelocatable-lib} %{fpic|fPIC|fpie|fPIE:-K PIC} \
+ %{memb} %{!memb: %{msdata=eabi: -memb}} \
+ %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
+     %{mcall-freebsd: -mbig} \
+@@ -525,7 +525,7 @@
+ 
+ #define MD_UNWIND_SUPPORT "config/rs6000/linux-unwind.h"
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* ppc32 glibc provides __stack_chk_guard in -0x7008(2),
+    ppc64 glibc provides it at -0x7010(13).  */
+ #define TARGET_THREAD_SSP_OFFSET	(TARGET_64BIT ? -0x7010 : -0x7008)
+diff -Nur gcc-4.5.0-vanilla/gcc/config/rs6000/linux.h gcc-4.5.0/gcc/config/rs6000/linux.h
+--- gcc-4.5.0-vanilla/gcc/config/rs6000/linux.h	2007-08-02 12:49:31.000000000 +0200
++++ gcc-4.5.0/gcc/config/rs6000/linux.h	2010-04-21 15:21:16.731819651 +0200
+@@ -117,7 +117,7 @@
+ 
+ #define MD_UNWIND_SUPPORT "config/rs6000/linux-unwind.h"
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* ppc32 glibc provides __stack_chk_guard in -0x7008(2).  */
+ #define TARGET_THREAD_SSP_OFFSET	-0x7008
+ #endif
+diff -Nur gcc-4.5.0-vanilla/gcc/config/rs6000/sysv4.h gcc-4.5.0/gcc/config/rs6000/sysv4.h
+--- gcc-4.5.0-vanilla/gcc/config/rs6000/sysv4.h	2009-11-25 21:23:20.000000000 +0100
++++ gcc-4.5.0/gcc/config/rs6000/sysv4.h	2010-04-21 15:21:16.674812959 +0200
+@@ -883,7 +883,12 @@
+ %{!mnewlib: %{pthread:-lpthread} %{shared:-lc} \
+ %{!shared: %{profile:-lc_p} %{!profile:-lc}}}"
+ 
+-#ifdef HAVE_LD_PIE
++#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS)
++#define STARTFILE_LINUX_SPEC \
++  "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
++  %{mnewlib:ecrti.o%s;:crti.o%s} \
++  {static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
++#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS)
+ #define	STARTFILE_LINUX_SPEC "\
+ %{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
+ %{mnewlib:ecrti.o%s;:crti.o%s} \
+diff -Nur gcc-4.5.0-vanilla/gcc/config/s390/linux.h gcc-4.5.0/gcc/config/s390/linux.h
+--- gcc-4.5.0-vanilla/gcc/config/s390/linux.h	2007-08-02 12:49:31.000000000 +0200
++++ gcc-4.5.0/gcc/config/s390/linux.h	2010-04-21 15:21:16.738814124 +0200
+@@ -93,7 +93,7 @@
+ 
+ #define MD_UNWIND_SUPPORT "config/s390/linux-unwind.h"
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* s390 glibc provides __stack_chk_guard in 0x14(tp),
+    s390x glibc provides it at 0x28(tp).  */
+ #define TARGET_THREAD_SSP_OFFSET        (TARGET_64BIT ? 0x28 : 0x14)
+diff -Nur gcc-4.5.0-vanilla/gcc/config/sparc/linux64.h gcc-4.5.0/gcc/config/sparc/linux64.h
+--- gcc-4.5.0-vanilla/gcc/config/sparc/linux64.h	2009-12-08 00:31:01.000000000 +0100
++++ gcc-4.5.0/gcc/config/sparc/linux64.h	2010-04-21 15:21:16.749816158 +0200
+@@ -298,7 +298,7 @@
+ #undef NEED_INDICATE_EXEC_STACK
+ #define NEED_INDICATE_EXEC_STACK 1
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14],
+    sparc64 glibc provides it at [%g7 + 0x28].  */
+ #define TARGET_THREAD_SSP_OFFSET	(TARGET_ARCH64 ? 0x28 : 0x14)
+diff -Nur gcc-4.5.0-vanilla/gcc/config/sparc/linux.h gcc-4.5.0/gcc/config/sparc/linux.h
+--- gcc-4.5.0-vanilla/gcc/config/sparc/linux.h	2009-12-08 00:31:01.000000000 +0100
++++ gcc-4.5.0/gcc/config/sparc/linux.h	2010-04-21 15:21:16.746815839 +0200
+@@ -172,7 +172,7 @@
+ #undef NEED_INDICATE_EXEC_STACK
+ #define NEED_INDICATE_EXEC_STACK 1
+ 
+-#ifdef TARGET_LIBC_PROVIDES_SSP
++#if defined TARGET_LIBC_PROVIDES_SSP && !defined __UCLIBC__
+ /* sparc glibc provides __stack_chk_guard in [%g7 + 0x14].  */
+ #define TARGET_THREAD_SSP_OFFSET	0x14
+ #endif
+diff -Nur gcc-4.5.0-vanilla/gcc/config.in gcc-4.5.0/gcc/config.in
+--- gcc-4.5.0-vanilla/gcc/config.in	2010-04-14 11:30:07.000000000 +0200
++++ gcc-4.5.0/gcc/config.in	2010-04-21 15:21:09.879812904 +0200
+@@ -52,6 +52,12 @@
+ #endif
+ 
+ 
++/* Define to 1 to enable crtbeginTS.o. */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_CRTBEGINTS
++#endif
++
++
+ /* Define to 1 to specify that we are using the BID decimal floating point
+    format instead of DPD */
+ #ifndef USED_FOR_TARGET
+@@ -71,6 +77,12 @@
+ #endif
+ 
+ 
++/* Define to 1 to enable esp. */
++#ifndef USED_FOR_TARGET
++#undef ENABLE_ESP
++#endif
++
++
+ /* Define to 1 to enable fixed-point arithmetic extension to C. */
+ #ifndef USED_FOR_TARGET
+ #undef ENABLE_FIXED_POINT
+@@ -996,6 +1008,12 @@
+ #endif
+ 
+ 
++/* Define to 1 if your compiler supports -fstack-protector */
++#ifndef USED_FOR_TARGET
++#undef HAVE_GCC_SSP
++#endif
++
++
+ /* Define to 1 if you have the `getchar_unlocked' function. */
+ #ifndef USED_FOR_TARGET
+ #undef HAVE_GETCHAR_UNLOCKED
+diff -Nur gcc-4.5.0-vanilla/gcc/configure gcc-4.5.0/gcc/configure
+--- gcc-4.5.0-vanilla/gcc/configure	2010-03-26 06:40:32.000000000 +0100
++++ gcc-4.5.0/gcc/configure	2010-04-21 15:21:09.784072083 +0200
 @@ -678,6 +678,8 @@
  HOST_LIBS
  GGC
@@ -77,7 +236,7 @@
  gcc_cv_readelf
  gcc_cv_objdump
  ORIGINAL_NM_FOR_TARGET
-@@ -24480,6 +24481,50 @@
+@@ -24576,6 +24578,50 @@
      ;;
  esac
  
@@ -128,10 +287,83 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --build-id support" >&5
  $as_echo_n "checking linker --build-id support... " >&6; }
  if test "${gcc_cv_ld_buildid+set}" = set; then :
-@@ -24411,6 +23745,74 @@
+@@ -24729,6 +24775,146 @@
  
  fi
  
++if test x$gcc_cv_libc_provides_ssp = xyes; then
++	echo "$as_me:$LINENO: checking whether $CC support -fstack-protector" >&5
++echo $ECHO_N "checking whether $CC support -fstack-protector... $ECHO_C" >&6
++if test "${gcc_cv_cc_stack_protector+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++	saved_CFLAGS="$CFLAGS"
++	CFLAGS="$CFLAGS -fstack-protector"
++      cat >conftest.$ac_ext <<_ACEOF
++#ifndef __SSP__
++#error
++#endif
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++		case $target in
++		i?86*-*-linux* | x86_64*-*-linux* | powerpc-*-linux* | powerpc64-*-linux*)
++			if test x$set_have_as_tls = xyes; then
++				gcc_cv_cc_stack_protector=yes
++			else
++				gcc_cv_cc_stack_protector=no
++			fi
++			;;
++		*)
++			cc_cv_cc_stack_protector=yes
++			;;
++		esac
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++gcc_cv_cc_stack_protector=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$saved_CFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $gcc_cv_cc_stack_protector" >&5
++echo "${ECHO_T}$gcc_cv_cc_stack_protector" >&6
++fi
++if test x$gcc_cv_cc_stack_protector = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_GCC_SSP 1
++_ACEOF
++
++fi
++
++
 +if test x$enable_esp = xyes ; then
 +case $target in
 +		ia64*-*-linux*)
@@ -153,7 +385,7 @@
 +			;;
 +	esac
 +else
-+	enable_espf_ld=no
++	enable_esp_ld=no
 +fi
 +if test x$enable_esp_ld = xyes; then
 +
@@ -162,7 +394,6 @@
 +_ACEOF
 +
 +fi
-+
 +if test x$enable_esp = xyes && test x$enable_esp_ld = xno; then
 +	{ { echo "$as_me:$LINENO: error: *** --enable-esp is not supported. You don't have -z,relro or -z,now support in the linker." >&5
 +echo "$as_me: error: *** --enable-esp is not supported. You don't have -z,relro or -z,now support in the linker." >&2;}
@@ -203,264 +434,227 @@
  # Check if TFmode long double should be used by default or not.
  # Some glibc targets used DFmode long double, but with glibc 2.4
  # and later they can use TFmode.
---- libmudflap/configure	2009-12-05 12:18:53.000000000 -0500
-+++ libmudflap/configure	2010-02-07 14:29:51.000000000 -0500
-@@ -652,6 +652,7 @@
- MAINTAINER_MODE_FALSE
- MAINTAINER_MODE_TRUE
- am__untar
-+enable_esp
- am__tar
- AMTAR
- am__leading_dot
-2010-05-24	Magnus Granberg		<zorry@gentoo.org>
-
-		* gcc/config.in	Add ENABLE_CRTBEGINTS and ENABLE_ESP
-
---- gcc/config.in	2009-04-21 11:08:08.000000000 +0200
-+++ gcc/config.in	2009-05-12 00:10:08.000000000 +0200
-@@ -46,6 +46,12 @@
- #endif
- 
+diff -Nur gcc-4.5.0-vanilla/gcc/cp/lang-specs.h gcc-4.5.0/gcc/cp/lang-specs.h
+--- gcc-4.5.0-vanilla/gcc/cp/lang-specs.h	2007-08-06 13:10:19.000000000 +0200
++++ gcc-4.5.0/gcc/cp/lang-specs.h	2010-04-21 15:21:16.684816335 +0200
+@@ -47,7 +47,7 @@
+ 		%(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
+       cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
+ 	      %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+-	%(cc1_options) %2 %{+e1*}\
++	%(cc1_options) %(esp_options) %2 %{+e1*}\
+ 	%{!fsyntax-only:-o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}}",
+      CPLUSPLUS_CPP_SPEC, 0, 0},
+   {"@c++",
+@@ -57,11 +57,11 @@
+ 		%(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
+       cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
+ 	      %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+-	%(cc1_options) %2 %{+e1*}\
++	%(cc1_options) %(esp_options) %2 %{+e1*}\
+        %{!fsyntax-only:%(invoke_as)}}}}",
+      CPLUSPLUS_CPP_SPEC, 0, 0},
+   {".ii", "@c++-cpp-output", 0, 0, 0},
+   {"@c++-cpp-output",
+    "%{!M:%{!MM:%{!E:\
+-    cc1plus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
++    cc1plus -fpreprocessed %i %(cc1_options) %(esp_options) %2 %{+e*}\
+     %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+diff -Nur gcc-4.5.0-vanilla/gcc/doc/invoke.texi gcc-4.5.0/gcc/doc/invoke.texi
+--- gcc-4.5.0-vanilla/gcc/doc/invoke.texi	2010-04-06 16:02:22.000000000 +0200
++++ gcc-4.5.0/gcc/doc/invoke.texi	2010-04-21 15:21:16.796812184 +0200
+@@ -7856,6 +7856,11 @@
+ @opindex fstack-protector-all
+ Like @option{-fstack-protector} except that all functions are protected.
  
-+/* Define to 1 to enable crtbeginTS.o. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_CRTBEGINTS
-+#endif
-+
++NOTE: When --enable-esp this option is enabled by default 
++for C, C++, ObjC, ObjC++, if neither @option{-fno-stack-protector}
++or @option{-nostdlib} or @option{-nodefaultlibs} or 
++@option{-fstack-protector} are found.
 +
- /* Define to 1 to specify that we are using the BID decimal floating point
-    format instead of DPD */
- #ifndef USED_FOR_TARGET
-@@ -65,6 +65,12 @@
- #endif
+ @item -fsection-anchors
+ @opindex fsection-anchors
+ Try to reduce the number of symbolic address calculations by using
+@@ -8705,6 +8710,12 @@
+ that were used to generate code (@option{-fpie}, @option{-fPIE},
+ or model suboptions) when you specify this option.
  
++NOTE: When --enable-esp this option is enabled by default
++for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
++or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
++@option{-nostartfiles} or @option{-shared} or @option{-pg} or @option{-p}
++are found.
++
+ @item -rdynamic
+ @opindex rdynamic
+ Pass the flag @option{-export-dynamic} to the ELF linker, on targets
+@@ -17251,6 +17262,11 @@
+ @code{__pie__} and @code{__PIE__}.  The macros have the value 1
+ for @option{-fpie} and 2 for @option{-fPIE}.
  
-+/* Define to 1 to enable esp. */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_ESP
-+#endif
++NOTE: When --enable-esp this option is enabled by default
++for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
++or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
++@option{-nostartfiles} or @option{-shared} are found.
 +
+ @item -fno-jump-tables
+ @opindex fno-jump-tables
+ Do not use jump tables for switch statements even where it would be
+diff -Nur gcc-4.5.0-vanilla/gcc/esp.h gcc-4.5.0/gcc/esp.h
+--- gcc-4.5.0-vanilla/gcc/esp.h	1970-01-01 01:00:00.000000000 +0100
++++ gcc-4.5.0/gcc/esp.h	2010-04-21 15:21:16.622811922 +0200
+@@ -0,0 +1,148 @@
++/* License terms see GNU GENERAL PUBLIC LICENSE Version 3.
++ * Version 20100409.1
++ * Magnus Granberg (Zorry) <zorry@gentoo.org>  */
++#ifndef GCC_ESP_H
++#define GCC_ESP_H
 +
- /* Define to 1 to enable fixed-point arithmetic extension to C. */
- #ifndef USED_FOR_TARGET
- #undef ENABLE_FIXED_POINT
-2010-04-25	Magnus Granberg		<zorry@gentoo.org> Anthony G. Basile	<basile@opensource.dyc.edu>
-
-		* Makefile.in	We add -fno-stack-protector to BOOT_CFLAGS, LIBCFLAGS and LIBCXXFLAGS if enable_esp yes.
-		* gcc/Makefile.in	Add -fno-PIE and -fno-stack-protector.
-	    Libgcc2 doesn't compile with -fstack-protector.
-	    Crtstuff doesn't compile with -fPIE and -fstack-protector.
-		$(out_object_file): ix86_split_to_parts() stack smashing attack b.g.o #149292.
-		Add crtbeginTS.o to EXTRA_PARTS if enable_crtbeginTS yes
-		We add new file crtbeginTS.o if enable_crtbeginTS yes
-		* libgcc/Makefile.in	Add crtbeginTS.o to EXTRA_PARTS if enable_crtbeginTS yes
-		We add new file crtbeginTS.o if enable_crtbeginTS yes
- 
-2010-04-25	Magnus Granberg		<zorry@gentoo.org>,	Kees Cook	<kees@outflux.net>
-
-		LP #344502
-		* libmudflap/Makefiles.in	Add -fno-stack-protector -U_FORTIFY_SOURCE
-		to AM_CFLAGS ifdef enable_esp.
-
---- Makefile.in	2010-01-22 08:35:38.000000000 -0500
-+++ Makefile.in	2010-02-07 15:10:59.000000000 -0500
-@@ -350,9 +350,17 @@
- BUILD_PREFIX = @BUILD_PREFIX@
- BUILD_PREFIX_1 = @BUILD_PREFIX_1@
- 
-+# Some stuff don't compile with SSP
-+enable_esp = @enable_esp@
-+ifeq ($(enable_esp),yes)
-+ESP_NOSSP_CFLAGS = -fno-stack-protector
-+else
-+ESP_NOSSP_CFLAGS=
-+endif
++/*	This file will add -fstack-protector, -fPIE, -pie -D_FORTIFY_SOURCES=2 -z,relro and -z,now 
++	as default if the defines and the spec allow it.
++	
++	On Gentoo
++	Added a hack for gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass
++	to support older hardened GCC patches and we don't need to change the code on gcc-specs-* and _filter-hardened.
++	We use -fstack-protector-all instead of -fstack-protector
++	This will add some unsupported upstream commands options as -nopie.
++	-D__KERNEL__ is added so we don't have -fPIE and -fstack-protector-all when building kernels.
++	ESP_CC1_SPEC is added to CC1_SPEC.
++	-D_FORTIFY_SOURCES=2 is added with gentoo's patchset as default so no need to set it hear.
++	ESP_LINK_SPEC will not add -z,relro as it default on with binutils.
++	ESP_CC1_STRICT_SPEC is added so we don't use gcc/opts.c to disable it.
++	ESP_OPTIONS_PIE_CHECK_SPEC check for -pie, -p, -pg, -profile, -static and -shared.
++	ENABLE_CRTBEGINTS add support for crtbeginTS.o, build -static with -fPIE or -fpie.
++*/
++#ifdef ENABLE_ESP
++	
++	/* Hack to support gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass  */
++	#define ESP_CC1_SPEC " %(esp_cc1_ssp) %(esp_cc1_pie) %(esp_cc1_strict)"
++	#ifdef HAVE_GCC_SSP
++		#define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: }}"
++	#else
++		#define ESP_CC1_SSP_SPEC ""
++	#endif
++	#define ESP_CC1_PIE_SPEC "%{!nopie: }"
++	#define ESP_CC1_STRICT_SPEC "%{!fstrict-overflow:%{!fno-strict-overflow: -fno-strict-overflow}}"
 +
- # Flags to pass to stage2 and later makes.  They are defined
- # here so that they can be overridden by Makefile fragments.
--BOOT_CFLAGS= -g -O2
-+BOOT_CFLAGS= -g -O2 $(ESP_NOSSP_CFLAGS)
- BOOT_LDFLAGS=
- BOOT_ADAFLAGS=-gnatpg -gnata
- 
-@@ -397,9 +405,9 @@
- 
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBCFLAGS = $(CFLAGS)
-+LIBCFLAGS = $(CFLAGS) $(ESP_NOSSP_CFLAGS)
- CXXFLAGS = @CXXFLAGS@
--LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
-+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates $(ESP_NOSSP_CFLAGS)
- 
- TFLAGS =
- 
---- gcc/Makefile.in	2010-01-22 17:22:51.000000000 -0500
-+++ gcc/Makefile.in	2010-02-07 15:15:13.000000000 -0500
-@@ -629,13 +629,24 @@
- INHIBIT_LIBC_CFLAGS = -Dinhibit_libc
- endif
- 
-+# We don't want __stack_chk_fail in crt* and libgcc2.a.
-+# We don't want to compile crtbegin, crtend and crtbeginT with -fPIE.
-+enable_esp = @enable_esp@
-+ifeq ($(enable_esp),yes)
-+ESP_NOPIE_CFLAGS = -fno-PIE
-+ESP_NOSSP_CFLAGS = -fno-stack-protector
-+else
-+ESP_NOPIE_CFLAGS=
-+ESP_NOSSP_CFLAGS=
-+endif
++	/*	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 "%{!now:-z now}"
++	
++	/*	ESP_OPTIONS_SPEC is added to the compiler spec in gcc/gcc.c  */
++	#define ESP_OPTIONS_SPEC "%(esp_options_ssp)"
 +
- # Options to use when compiling libgcc2.a.
- #
- LIBGCC2_DEBUG_CFLAGS = -g
- LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(TARGET_LIBGCC2_CFLAGS) \
- 		 $(LIBGCC2_DEBUG_CFLAGS) $(GTHREAD_FLAGS) \
- 		 -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
--		 $(INHIBIT_LIBC_CFLAGS)
-+		 $(INHIBIT_LIBC_CFLAGS) $(ESP_NOSSP_CFLAGS)
- 
- # Additional options to use when compiling libgcc2.a.
- # Some targets override this to -isystem include
-@@ -648,7 +659,7 @@
- CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
-   -finhibit-size-directive -fno-inline -fno-exceptions \
-   -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
--  $(INHIBIT_LIBC_CFLAGS)
-+  $(INHIBIT_LIBC_CFLAGS) $(ESP_NOSSP_CFLAGS)
- 
- # Additional sources to handle exceptions; overridden by targets as needed.
- LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \
-@@ -678,6 +689,12 @@
- # The rules for compiling them should be in the t-* file for the machine.
- EXTRA_PARTS = @extra_parts@
- 
-+# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes
-+enable_crtbeginTS = @enable_crtbeginTS@
-+ifeq ($(enable_crtbeginTS),yes)
-+EXTRA_PARTS += crtbeginTS.o
-+endif
++	/*	ESP_CPP_OPTIONS_SPEC is added to the cpp_options spec in gcc/gcc.c  
++		For precompiling headers.  */
++	#define ESP_CPP_OPTIONS_SPEC "%(esp_options_ssp)"
 +
- # List of extra object files that should be compiled and linked with
- # compiler proper (cc1, cc1obj, cc1plus).
- EXTRA_OBJS = @extra_objs@
-@@ -1856,9 +1873,10 @@
- 	echo LIBGCC_SYNC = '$(LIBGCC_SYNC)' >> tmp-libgcc.mvars
- 	echo LIBGCC_SYNC_CFLAGS = '$(LIBGCC_SYNC_CFLAGS)' >> tmp-libgcc.mvars
- 	echo CRTSTUFF_CFLAGS = '$(CRTSTUFF_CFLAGS)' >> tmp-libgcc.mvars
--	echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS)' >> tmp-libgcc.mvars
-+	echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS) $(ESP_NOPIE_CFLAGS)' >> tmp-libgcc.mvars
- 	echo CRTSTUFF_T_CFLAGS_S = '$(CRTSTUFF_T_CFLAGS_S)' >> tmp-libgcc.mvars
- 	echo TARGET_SYSTEM_ROOT = '$(TARGET_SYSTEM_ROOT)' >> tmp-libgcc.mvars
-+	echo enable_crtbeginTS = '$(enable_crtbeginTS)' >> tmp-libgcc.mvars
- 
- 	mv tmp-libgcc.mvars libgcc.mvars
- 
-@@ -1892,12 +1910,14 @@
- $(T)crtbegin.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
-   gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
- 	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
-+	$(ESP_NOPIE_CFLAGS) \
- 	  -c $(srcdir)/crtstuff.c -DCRT_BEGIN \
- 	  -o $(T)crtbegin$(objext)
- 
- $(T)crtend.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
-   gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
- 	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
-+	$(ESP_NOPIE_CFLAGS) \
- 	  -c $(srcdir)/crtstuff.c -DCRT_END \
- 	  -o $(T)crtend$(objext)
- 
-@@ -1918,9 +1938,19 @@
- $(T)crtbeginT.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
-   gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
- 	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
-+	$(ESP_NOPIE_CFLAGS) \
- 	  -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O \
- 	  -o $(T)crtbeginT$(objext)
- 
-+# This is a version of crtbegin for -static -fPIE links if esp is enable.
-+ifeq ($(enable_crtbeginTS),yes)
-+$(T)crtbeginTS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
-+  gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
-+	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
-+	  -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O \
-+	  -o $(T)crtbeginTS$(objext)
-+endif
++	/*  This will add -fstack-protector-all if we don't have -nostdlib -nodefaultlibs -fno-stack-protector -fstack-protector
++		-fstack-protector-all and we have TARGET_LIBC_PROVIDES_SSP and HAVE_GCC_SSP defined.  */
++	#ifdef HAVE_GCC_SSP
++		#define ESP_OPTIONS_SSP_SPEC \
++			"%{!D__KERNEL__:%{!nostdlib:%{!nodefaultlibs: %{!fno-stack-protector: \
++			%{!fstack-protector:%{!fstack-protector-all:-fstack-protector-all}}}}}}"
++	#else
++		#define ESP_OPTIONS_SSP_SPEC ""
++	#endif
 +
- # Compile the start modules crt0.o and mcrt0.o that are linked with
- # every program
- $(T)crt0.o: s-crt0 ; @true
---- libgcc/Makefile.in	2009-07-30 18:33:49.000000000 -0400
-+++ libgcc/Makefile.in	2010-02-07 15:10:59.000000000 -0500
-@@ -291,6 +291,12 @@
- gen-hide-list = echo > \$@
- endif
- 
-+# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes
-+enable_libgcc_crtbeginTS = $(enable_crtbeginTS)
-+ifeq ($(enable_libgcc_crtbeginTS),yes)
-+EXTRA_PARTS += crtbeginTS.o
-+endif
++	/* If HAVE_LD_PIE not defined we will not add any -fPIE -pie  */
++	#ifdef HAVE_LD_PIE
 +
- ifneq ($(EXTRA_PARTS),)
-   extra-parts = libgcc-extra-parts
-   INSTALL_PARTS = $(EXTRA_PARTS)
-@@ -842,6 +848,13 @@
- crtbeginT.o: $(gcc_srcdir)/crtstuff.c
- 	$(crt_compile) $(CRTSTUFF_T_CFLAGS) \
- 	  -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O
++		/*	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 is a version of crtbegin for -static -fPIE links.
-+ifeq ($(enable_libgcc_crtbeginTS),yes)
-+crtbeginTS.o: $(gcc_srcdir)/crtstuff.c
-+	$(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \
-+	  -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O
-+endif
- endif
- 
- # Build extra startfiles in the libgcc directory.
---- libmudflap/Makefile.in	2009-12-05 12:18:53.000000000 -0500
-+++ libmudflap/Makefile.in	2010-02-07 15:10:59.000000000 -0500
-@@ -253,9 +253,17 @@
- MAINT_CHARSET = latin1
- SUBDIRS = testsuite
- 
-+# Some stuff don't compile with SSP and FORTIFY_SOURCE
-+enable_esp = @enable_esp@
-+ifeq ($(enable_esp),yes)
-+	NO_ESP_CFLAGS = -fno-stack-protector -U_FORTIFY_SOURCE
-+else
-+	NO_ESP_CFLAGS =
-+endif
++		/*  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  */
++		#ifdef ENABLE_CRTBEGINTS
++			#define ESP_OPTIONS_PIE_SPEC \
++				"%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
++				%{!shared: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }"
++		#else
++			#define ESP_OPTIONS_PIE_SPEC \
++				"%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
++				%{!shared: %{!static: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }}"
++		#endif
 +
- # May be used by various substitution variables.
- gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
--AM_CFLAGS = -Wall $(SECTION_FLAGS)
-+AM_CFLAGS = -Wall $(SECTION_FLAGS) $(NO_ESP_CFLAGS)
- @LIBMUDFLAPTH_FALSE@libmudflapth = 
- @LIBMUDFLAPTH_TRUE@libmudflapth = libmudflapth.la
- toolexeclib_LTLIBRARIES = libmudflap.la $(libmudflapth)
-2010-05-26	Magnus Granberg		<zorry@gentoo.org>, Anthony G. Basile	<basile@opensource.dyc.edu>
-
-		* gcc/gcc.c								include esp.h
-		static const char *cc1_spec 			We set that in esp.h if ENABLE_ESP.
-		#ifdef EXTRA_SPECS:						Add ESP_EXTRA_SPECS
-		main():									Add do_self_spec esp_command_options_spec()
-
-2009-06-27	Matthias Klose		<doko@ubuntu.com>, Kees Cook	<kees@outflux.net>,
-			Anthony G. Basile	<basile@opensource.dyc.edu>
-
-		LP #346126
-		* gcc/gcc.c		*cpp_options			Add %(esp_cpp_options)
-		
-		* gcc/gcc.c		default_compilers[]		Add %(esp_options)
-		*cpp_unique_options						Add %(esp_cpp_unique_options)
-
---- gcc/gcc.c	2010-01-21 10:29:30.000000000 -0500
-+++ gcc/gcc.c	2010-01-29 23:29:16.000000000 -0500
++		/*  This will add -pie if we don't have -pie -A -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static -r -nostdlib 
++			-nostartfiles  */
++		/*  With ENABLE_CRTBEGINTS we don't need to check for -static
++			and we add -pie only to get the start and endfiles. -pie will not go to the linker. */
++		#ifdef ENABLE_CRTBEGINTS
++			#define ESP_LINK_PIE_SPEC \
++				"%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!r: \
++				%{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}"
++		#else
++			#define ESP_LINK_PIE_SPEC \
++				"%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r: \
++				%{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}"
++		#endif
++		
++		/*  This will check if shared is set when -static -pie -fPIE -fpie -fno-PIC -fno-pic, -pie is set when -static -pg -p -profile.  
++			If set it will make gcc print out "-shared and -static|pie|fPIE|fpie|fno-PIC|fno-pic are incompatible" or
++			"-pie and pg|p|profile are incompatible"  */
++		/*  With ENABLE_CRTBEGINTS we don't need to check for -static  */
++		#ifdef ENABLE_CRTBEGINTS
++			#define ESP_OPTIONS_PIE_CHECK_SPEC \
++				"%{shared:%{static|pie|fPIE|fpie|fno-PIC|fno-pic:%e-shared and -static|pie|fPIE|fpie|fno-PIC|fno-pic are incompatible}} \
++				%{pie:%{pg|p|profile:%e-pie and -pg|p|profile are incompatible}}"
++		#else
++			#define ESP_OPTIONS_PIE_CHECK_SPEC \
++				"%{shared:%{static|pie|fPIE|fpie|fno-PIC|fno-pic:%e-shared and -static|pie|fPIE|fpie|fno-PIC|fno-pic are incompatible}} \
++				%{pie:%{static|pg|p|profile:%e-pie and -static|pg|p|profile are incompatible}}"
++		#endif
++
++		/*  We don't pass -pie to the linker when -static  */
++		#ifdef ENABLE_CRTBEGINTS
++			#define LINK_PIE_SPEC "%{!static:%{pie:-pie}} %(esp_link) "
++		#else
++			#define LINK_PIE_SPEC "%{pie:-pie} %(esp_link) "
++		#endif
++
++	#else
++		#define ESP_OPTIONS_PIE_SPEC ""
++		#define ESP_OPTIONS_PIE_CHECK_SPEC ""
++		#define ESP_LINK_PIE_SPEC ""
++		#define LINK_PIE_SPEC "%{pie:-pie} %(esp_link) "
++	#endif
++
++	/*  We add extra spec name's to the EXTRA_SPECS list  */
++	#define ESP_EXTRA_SPECS \
++		{ "esp_cc1",								ESP_CC1_SPEC },					\
++		{ "esp_cc1_pie",							ESP_CC1_PIE_SPEC },				\
++		{ "esp_cc1_ssp",							ESP_CC1_SSP_SPEC },				\
++		{ "esp_cc1_strict",						ESP_CC1_STRICT_SPEC },				\
++		{ "esp_link",								ESP_LINK_SPEC },					\
++		{ "esp_link_now",							ESP_LINK_NOW_SPEC },				\
++		{ "esp_link_pie",							ESP_LINK_PIE_SPEC },				\
++		{ "esp_command_options",					ESP_COMMAND_OPTIONS_SPEC },		\
++		{ "esp_cpp_options",						ESP_CPP_OPTIONS_SPEC },			\
++		{ "esp_options",							ESP_OPTIONS_SPEC },				\
++		{ "esp_options_pie",						ESP_OPTIONS_PIE_SPEC },			\
++		{ "esp_options_pie_check",					ESP_OPTIONS_PIE_CHECK_SPEC },		\
++		{ "esp_options_ssp",						ESP_OPTIONS_SSP_SPEC }
++
++	static const char *esp_command_options_spec = ESP_COMMAND_OPTIONS_SPEC;
++	static const char *cc1_spec = CC1_SPEC ESP_CC1_SPEC;
++
++#else /* If not ESP_ENABLE defined do this.  */
++
++	#define ESP_OPTIONS_SPEC ""
++	#define ESP_CPP_OPTIONS_SPEC ""
++
++	/*  We add extra spec name's to the EXTRA_SPECS list  */
++	#define ESP_EXTRA_SPECS \
++		{ "esp_options",				ESP_OPTIONS_SPEC },			\
++		{ "esp_cpp_options",			ESP_CPP_OPTIONS_SPEC }
++
++#endif
++#endif /* End GCC_ESP_H */
+diff -Nur gcc-4.5.0-vanilla/gcc/gcc.c gcc-4.5.0/gcc/gcc.c
+--- gcc-4.5.0-vanilla/gcc/gcc.c	2010-02-11 13:23:08.000000000 +0100
++++ gcc-4.5.0/gcc/gcc.c	2010-04-21 15:21:16.589812777 +0200
 @@ -84,6 +84,7 @@
  #include "gcc.h"
  #include "flags.h"
@@ -488,6 +682,16 @@
  
  /* This contains cpp options which are not passed when the preprocessor
     output will be used by another program.  */
+@@ -893,6 +896,9 @@
+ 
+ /* NB: This is shared amongst all front-ends, except for Ada.  */
+ static const char *cc1_options =
++#ifdef ENABLE_ESP
++"%(esp_options_pie_check)"
++#endif
+ "%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
+  %1 %{!Q:-quiet} %{!dumpbase:-dumpbase %B} %{d*} %{m*} %{a*}\
+  %{fcompare-debug-second:%:compare-debug-auxbase-opt(%b)} \
 @@ -1075,15 +1081,15 @@
  	  %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
  		%(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
@@ -560,7 +764,7 @@
  
    for (i = ARRAY_SIZE (static_specs) - 1; i >= 0; i--)
      {
-@@ -7096,6 +7123,12 @@
+@@ -7111,6 +7120,12 @@
      gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str,
  			      spec_version, dir_separator_str, NULL);
  
@@ -573,268 +777,107 @@
    /* Now we have the specs.
       Set the `valid' bits for switches that match anything in any spec.  */
  
-2009-06-13	Magnus Granberg		<zorry@ume.nu>
-		
-		b.g.o #232601
-		* gcc/varasm.c (decl_tls_model): Check flag_pic instead of flag_shlib.
-
---- gcc/varasm.c	2009-03-17 21:18:21.000000000 +0100
-+++ gcc/varasm.c	2009-04-29 03:10:09.000000000 +0200
-@@ -5607,7 +5607,11 @@
-   bool is_local;
+diff -Nur gcc-4.5.0-vanilla/gcc/Makefile.in gcc-4.5.0/gcc/Makefile.in
+--- gcc-4.5.0-vanilla/gcc/Makefile.in	2010-04-02 09:49:06.000000000 +0200
++++ gcc-4.5.0/gcc/Makefile.in	2010-04-21 15:21:10.033812913 +0200
+@@ -636,13 +636,24 @@
+ INHIBIT_LIBC_CFLAGS = -Dinhibit_libc
+ endif
  
-   is_local = targetm.binds_local_p (decl);
--  if (!flag_shlib)
-+  #ifdef ENABLE_ESP
-+    if (!flag_pic)
-+  #else
-+    if (!flag_shlib)
-+  #endif
-     {
-       if (is_local)
- 	kind = TLS_MODEL_LOCAL_EXEC;
-2010-05-27		Magnus Granberg		<zorry@gentoo.org>
-
-		* gcc/esp.h	New file to support --enable-esp
-		Version 20100527.1
-
---- gcc/esp.h	2010-04-09 16:14:00.000000000 +0200
-+++ gcc/esp.h	2010-04-29 21:30:47.000000000 +0200
-@@ -0,0 +1,145 @@
-+/* License terms see GNU GENERAL PUBLIC LICENSE Version 3.
-+ * Version 20100527.1
-+ * Magnus Granberg (Zorry) <zorry@gentoo.org>  */
-+#ifndef GCC_ESP_H
-+#define GCC_ESP_H
-+
-+/*	This file will add -fstack-protector-all, -fPIE, -pie and -z now 
-+	as default if the defines and the spec allow it.
-+	Added a hack for gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass
-+	to support older hardened GCC patches and we don't need to change the code on gcc-specs-* and _filter-hardened.
-+	This will add some unsupported upstream commands options as -nopie and -nonow.
-+	-D__KERNEL__ is added so we don't have -fPIE, -pie and -fstack-protector-all when building kernels.
-+	ESP_CC1_SPEC is added to CC1_SPEC.
-+	ESP_CC1_STRICT_OVERFLOW_SPEC is added so we don't disable the strict-overflow check.
-+	ESP_LINK_PIE_CHECK_SPEC check for -pie, -p, -pg, -profile and -static.
-+	ENABLE_CRTBEGINTS add support for crtbeginTS.o, build -static with -fPIE or -fpie.
-+*/
-+#ifdef ENABLE_ESP
-+	
-+	/* Hack to support gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass  */
-+	#define ESP_CC1_SPEC " %(esp_cc1_ssp) %(esp_cc1_pie) %(esp_cc1_strict_overflow)"
-+	#if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP )
-+		#define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: }}"
-+	#else
-+		#define ESP_CC1_SSP_SPEC ""
-+	#endif
-+	#if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP )
-+		#define ESP_CC1_PIE_SPEC "%{!nopie: }"
-+	#else
-+		#define ESP_CC1_PIE_SPEC ""
-+	#endif
-+	#define ESP_CC1_STRICT_OVERFLOW_SPEC "%{!fstrict-overflow:%{!fno-strict-overflow: -fno-strict-overflow}}"
++# We don't want __stack_chk_fail in crt* and libgcc2.a.
++# We don't want to compile crtbegin, crtend and crtbeginT with -fPIE.
++enable_esp = @enable_esp@
++ifeq ($(enable_esp),yes)
++ESP_NOPIE_CFLAGS = -fno-PIE
++ESP_NOSSP_CFLAGS = -fno-stack-protector
++else
++ESP_NOPIE_CFLAGS=
++ESP_NOSSP_CFLAGS=
++endif
 +
-+	/*	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. We do a -pie incompatible check
-+		Don't remove the specs in the end  */
-+	#define ESP_LINK_SPEC "%(esp_link_now) %(esp_link_pie_check) "
-+	#define ESP_LINK_NOW_SPEC "%{!nonow:-z now}"
+ # Options to use when compiling libgcc2.a.
+ #
+ LIBGCC2_DEBUG_CFLAGS = -g
+ LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(TARGET_LIBGCC2_CFLAGS) \
+ 		 $(LIBGCC2_DEBUG_CFLAGS) $(GTHREAD_FLAGS) \
+ 		 -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
+-		 $(INHIBIT_LIBC_CFLAGS)
++		 $(INHIBIT_LIBC_CFLAGS) $(ESP_NOSSP_CFLAGS)
+ 
+ # Additional options to use when compiling libgcc2.a.
+ # Some targets override this to -isystem include
+@@ -655,7 +666,7 @@
+ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
+   -finhibit-size-directive -fno-inline -fno-exceptions \
+   -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \
+-  $(INHIBIT_LIBC_CFLAGS)
++  $(INHIBIT_LIBC_CFLAGS) $(ESP_NOSSP_CFLAGS)
+ 
+ # Additional sources to handle exceptions; overridden by targets as needed.
+ LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \
+@@ -685,6 +696,12 @@
+ # The rules for compiling them should be in the t-* file for the machine.
+ EXTRA_PARTS = @extra_parts@
+ 
++# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes
++enable_crtbeginTS = @enable_crtbeginTS@
++ifeq ($(enable_crtbeginTS),yes)
++EXTRA_PARTS += crtbeginTS.o
++endif
 +
-+	/*	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)"
-+
-+	/*	ESP_CPP_OPTIONS_SPEC is added to the cpp_options spec in gcc/gcc.c  
-+		For precompiling headers.  */
-+	#define ESP_CPP_OPTIONS_SPEC "%(esp_options_ssp)"
-+
-+	/*  This will add -fstack-protector-all if we don't have -nostdlib -nodefaultlibs -fno-stack-protector -fstack-protector
-+		-fstack-protector-all and we have EFAULT_SSP or EFAULT_PIE_SSP defined.  */
-+	#if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP )
-+		#define ESP_OPTIONS_SSP_SPEC \
-+			"%{!D__KERNEL__:%{!nostdlib:%{!nodefaultlibs: %{!fno-stack-protector: \
-+			%{!fstack-protector:%{!fstack-protector-all:-fstack-protector-all}}}}}}"
-+	#else
-+		#define ESP_OPTIONS_SSP_SPEC ""
-+	#endif
-+
-+	/* If EFAULT_PIE or EFAULT_PIE_SSP is defined we will add -fPIE -pie  */
-+	#if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP )
-+
-+		/*  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  */
-+		#ifdef ENABLE_CRTBEGINTS
-+			#define ESP_OPTIONS_PIE_SPEC \
-+				"%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
-+				%{!shared: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }"
-+		#else
-+			#define ESP_OPTIONS_PIE_SPEC \
-+				"%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \
-+				%{!shared: %{!static: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }}"
-+		#endif
-+
-+		/*  This will add -pie if we don't have -pie -A -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static -r -nostdlib 
-+			-nostartfiles  */
-+		/*  With ENABLE_CRTBEGINTS we don't need to check for -static
-+			and we add -pie only to get the start and endfiles. -pie will not go to the linker. */
-+		#ifdef ENABLE_CRTBEGINTS
-+			#define ESP_LINK_PIE_SPEC \
-+				"%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!r: \
-+				%{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}"
-+		#else
-+			#define ESP_LINK_PIE_SPEC \
-+				"%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r: \
-+				%{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}"
-+		#endif
-+		
-+		/*  This will check if -pie is set when (-static) -pg -p -profile. If set it will make gcc print out
-+			"-pie and (static)|pg|p|profile are incompatible when linking"  */
-+		/*  With ENABLE_CRTBEGINTS we don't need to check for -static  */
-+		#ifdef ENABLE_CRTBEGINTS
-+			#define ESP_LINK_PIE_CHECK_SPEC \
-+				"%{pie:%{pg|p|profile:%e-pie and -pg|p|profile are incompatible when linking}}"
-+		#else
-+			#define ESP_LINK_PIE_CHECK_SPEC \
-+				"%{pie:%{static|pg|p|profile:%e-pie and -static|pg|p|profile are incompatible when linking}}"
-+		#endif
-+
-+		/*  We don't pass -pie to the linker when -static.  */
-+		#ifdef ENABLE_CRTBEGINTS
-+			#define LINK_PIE_SPEC "%{!static:%{pie:-pie}} %(esp_link)"
-+		#else
-+			#define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)"
-+		#endif
-+
-+	#else
-+		#define ESP_OPTIONS_PIE_SPEC ""
-+		#define ESP_LINK_PIE_CHECK_SPEC ""
-+		#define ESP_LINK_PIE_SPEC ""
-+		#define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)"
-+	#endif
-+
-+	/*  We add extra spec name's to the EXTRA_SPECS list  */
-+	#define ESP_EXTRA_SPECS \
-+		{ "esp_cc1",								ESP_CC1_SPEC },					\
-+		{ "esp_cc1_pie",							ESP_CC1_PIE_SPEC },				\
-+		{ "esp_cc1_ssp",							ESP_CC1_SSP_SPEC },				\
-+		{ "esp_cc1_strict_overflow",				ESP_CC1_STRICT_OVERFLOW_SPEC },	\
-+		{ "esp_link",								ESP_LINK_SPEC },				\
-+		{ "esp_link_now",							ESP_LINK_NOW_SPEC },			\
-+		{ "esp_link_pie",							ESP_LINK_PIE_SPEC },			\
-+		{ "esp_link_pie_check",						ESP_LINK_PIE_CHECK_SPEC },		\
-+		{ "esp_command_options",					ESP_COMMAND_OPTIONS_SPEC },		\
-+		{ "esp_cpp_options",						ESP_CPP_OPTIONS_SPEC },			\
-+		{ "esp_options",							ESP_OPTIONS_SPEC },				\
-+		{ "esp_options_pie",						ESP_OPTIONS_PIE_SPEC },			\
-+		{ "esp_options_ssp",						ESP_OPTIONS_SSP_SPEC }
-+
-+	static const char *esp_command_options_spec = ESP_COMMAND_OPTIONS_SPEC;
-+	static const char *cc1_spec = CC1_SPEC ESP_CC1_SPEC;
-+
-+#else /* If not ESP_ENABLE defined do this.  */
-+
-+	#define ESP_OPTIONS_SPEC ""
-+	#define ESP_CPP_OPTIONS_SPEC ""
-+
-+	/*  We add extra spec name's to the EXTRA_SPECS list  */
-+	#define ESP_EXTRA_SPECS \
-+		{ "esp_options",				ESP_OPTIONS_SPEC },			\
-+		{ "esp_cpp_options",			ESP_CPP_OPTIONS_SPEC }
-+
-+#endif
-+#endif /* End GCC_ESP_H */
-2010-04-25		Peter S. Mazinger	<ps.m@gmx.net>, Magnus Granberg		<zorry@gentoo.org>
-
-		* gcc/config/rs6000/linux64.h	ASM_SPEC32 Change %{fpic:-K PIC} %{fPIC:-K PIC}
-		to %{fpic|fPIC|fpie|fPIE:-K PIC}
-
---- gcc/config/rs6000/linux64.h.psm	2009-04-10 01:23:07.000000000 +0200
-+++ gcc/config/rs6000/linux64.h	2009-09-23 12:34:26.000000000 +0200
-@@ -162,7 +162,7 @@
- #endif
+ # List of extra object files that should be compiled and linked with
+ # compiler proper (cc1, cc1obj, cc1plus).
+ EXTRA_OBJS = @extra_objs@
+@@ -1863,9 +1880,10 @@
+ 	echo LIBGCC_SYNC = '$(LIBGCC_SYNC)' >> tmp-libgcc.mvars
+ 	echo LIBGCC_SYNC_CFLAGS = '$(LIBGCC_SYNC_CFLAGS)' >> tmp-libgcc.mvars
+ 	echo CRTSTUFF_CFLAGS = '$(CRTSTUFF_CFLAGS)' >> tmp-libgcc.mvars
+-	echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS)' >> tmp-libgcc.mvars
++	echo CRTSTUFF_T_CFLAGS = '$(CRTSTUFF_T_CFLAGS) $(ESP_NOPIE_CFLAGS)' >> tmp-libgcc.mvars
+ 	echo CRTSTUFF_T_CFLAGS_S = '$(CRTSTUFF_T_CFLAGS_S)' >> tmp-libgcc.mvars
+ 	echo TARGET_SYSTEM_ROOT = '$(TARGET_SYSTEM_ROOT)' >> tmp-libgcc.mvars
++	echo enable_crtbeginTS = '$(enable_crtbeginTS)' >> tmp-libgcc.mvars
  
- #define ASM_SPEC32 "-a32 %{n} %{T} %{Ym,*} %{Yd,*} \
--%{mrelocatable} %{mrelocatable-lib} %{fpic:-K PIC} %{fPIC:-K PIC} \
-+%{mrelocatable} %{mrelocatable-lib} %{fpic|fPIC|fpie|fPIE:-K PIC} \
- %{memb} %{!memb: %{msdata=eabi: -memb}} \
- %{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
-     %{mcall-freebsd: -mbig} \
-2010-06-18		Magnus Granberg		<zorry@gentoo.org>
-
-		* gcc/config/linux.h			If ENABLE_CRTBEGINTS, -static and -pie use crtbegineTS.o.
-		* gcc/config/rs6000/sysv4.h		If ENABLE_CRTBEGINTS, -static and -pie use crtbegineTS.o.
-
---- gcc/config/linux.h	2009-04-10 01:23:07.000000000 +0200
-+++ gcc/config/linux.h	2009-09-08 04:08:06.000000000 +0200
-@@ -43,7 +43,11 @@
-    object constructed before entering `main'.  */
-    
- #undef	STARTFILE_SPEC
--#if defined HAVE_LD_PIE
-+#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS)
-+#define STARTFILE_SPEC \
-+  "%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} crti.o%s \
-+   %{static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
-+#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS)
- #define 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
-@@ -883,7 +883,12 @@
- %{!mnewlib: %{pthread:-lpthread} %{shared:-lc} \
- %{!shared: %{profile:-lc_p} %{!profile:-lc}}}"
+ 	mv tmp-libgcc.mvars libgcc.mvars
  
--#ifdef HAVE_LD_PIE
-+#if defined (HAVE_LD_PIE) && defined (ENABLE_CRTBEGINTS)
-+#define STARTFILE_LINUX_SPEC "\
-+%{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
-+%{mnewlib:ecrti.o%s;:crti.o%s} \
-+%{static:%{pie:crtbeginTS.o%s;:crtbeginT.o%s}} %{!static:%{shared|pie:crtbeginS.o%s;:crtbegin.o%s}}"
-+#elif defined (HAVE_LD_PIE) && ! defined (ENABLE_CRTBEGINTS)
- #define	STARTFILE_LINUX_SPEC "\
- %{!shared: %{pg|p|profile:gcrt1.o%s;pie:Scrt1.o%s;:crt1.o%s}} \
- %{mnewlib:ecrti.o%s;:crti.o%s} \
-2009-06-18	Matthias Klose		<doko@ubuntu.com>, Kees Cook	<kees@outflux.net>
-
-		LP #346126
-		* gcc/cp/lang-specs.h	compiler spec	Add %(esp_options).
-
---- gcc/cp/lang-specs.h.orig	2009-03-23 01:21:54.000000000 +0100
-+++ gcc/cp/lang-specs.h	2009-03-23 01:22:16.000000000 +0100
-@@ -47,7 +47,7 @@
- 		%(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
-       cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
- 	      %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
--	%(cc1_options) %2 %{+e1*}\
-+	%(cc1_options) %(esp_options) %2 %{+e1*}\
- 	%{!fsyntax-only:-o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}}",
-      CPLUSPLUS_CPP_SPEC, 0, 0},
-   {"@c++",
-@@ -57,11 +57,11 @@
- 		%(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
-       cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
- 	      %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
--	%(cc1_options) %2 %{+e1*}\
-+	%(cc1_options) %(esp_options) %2 %{+e1*}\
-        %{!fsyntax-only:%(invoke_as)}}}}",
-      CPLUSPLUS_CPP_SPEC, 0, 0},
-   {".ii", "@c++-cpp-output", 0, 0, 0},
-   {"@c++-cpp-output",
-    "%{!M:%{!MM:%{!E:\
--    cc1plus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
-+    cc1plus -fpreprocessed %i %(cc1_options) %(esp_options) %2 %{+e*}\
-     %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-2009-06-18	Matthias Klose		<doko@ubuntu.com>,	Kees Cook	<kees@outflux.net>
-
-		LP #346126
-		* gcc/objc/lang-specs.h		compiler spec	Add %(esp_options).
-
---- gcc/objc/lang-specs.h	2009-03-23 01:21:54.000000000 +0100
-+++ gcc/objc/lang-specs.h	2009-03-23 01:22:16.000000000 +0100
+@@ -1899,12 +1917,14 @@
+ $(T)crtbegin.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+   gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ 	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
++	$(ESP_NOPIE_CFLAGS) \
+ 	  -c $(srcdir)/crtstuff.c -DCRT_BEGIN \
+ 	  -o $(T)crtbegin$(objext)
+ 
+ $(T)crtend.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+   gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ 	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
++	$(ESP_NOPIE_CFLAGS) \
+ 	  -c $(srcdir)/crtstuff.c -DCRT_END \
+ 	  -o $(T)crtend$(objext)
+ 
+@@ -1925,9 +1945,19 @@
+ $(T)crtbeginT.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
+   gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
+ 	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS) \
++	$(ESP_NOPIE_CFLAGS) \
+ 	  -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O \
+ 	  -o $(T)crtbeginT$(objext)
+ 
++# This is a version of crtbegin for -static -fPIE links if esp is enable.
++ifeq ($(enable_crtbeginTS),yes)
++$(T)crtbeginTS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \
++  gbl-ctors.h stmp-int-hdrs tsystem.h coretypes.h $(TM_H)
++	$(GCC_FOR_TARGET) $(CRTSTUFF_CFLAGS) $(CRTSTUFF_T_CFLAGS_S) \
++	  -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O \
++	  -o $(T)crtbeginTS$(objext)
++endif
++
+ # Compile the start modules crt0.o and mcrt0.o that are linked with
+ # every program
+ $(T)crt0.o: s-crt0 ; @true
+diff -Nur gcc-4.5.0-vanilla/gcc/objc/lang-specs.h gcc-4.5.0/gcc/objc/lang-specs.h
+--- gcc-4.5.0-vanilla/gcc/objc/lang-specs.h	2007-08-02 12:37:36.000000000 +0200
++++ gcc-4.5.0/gcc/objc/lang-specs.h	2010-04-21 15:21:16.702913793 +0200
 @@ -30,13 +30,13 @@
  	%{traditional|ftraditional|traditional-cpp:\
  %eGNU Objective C no longer supports traditional compilation}\
@@ -865,13 +908,9 @@
 +	    cc1obj %(cpp_unique_options) %(cc1_options) %(esp_options) %{print-objc-runtime-info} %{gen-decls}\
                          -o %g.s %{!o*:--output-pch=%i.gch}\
                          %W{o*:--output-pch=%*}%V}}}}}", 0, 0, 0},
-2009-06-18	Matthias Klose		<doko@ubuntu.com>,	Kees Cook	<kees@outflux.net>
-
-		LP #346126
-		* gcc/objcp/lang-specs.h	compiler spec	Add %(esp_options).
-
---- gcc/objcp/lang-specs.h	2009-03-23 01:21:54.000000000 +0100
-+++ gcc/objcp/lang-specs.h	2009-03-23 01:22:16.000000000 +0100
+diff -Nur gcc-4.5.0-vanilla/gcc/objcp/lang-specs.h gcc-4.5.0/gcc/objcp/lang-specs.h
+--- gcc-4.5.0-vanilla/gcc/objcp/lang-specs.h	2007-08-02 12:38:44.000000000 +0200
++++ gcc-4.5.0/gcc/objcp/lang-specs.h	2010-04-21 15:21:16.708817730 +0200
 @@ -36,7 +36,7 @@
  		%(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\
        cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.mii} %{!save-temps:%g.mii}}\
@@ -900,47 +939,118 @@
 -    cc1objplus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
 +    cc1objplus -fpreprocessed %i %(cc1_options) %(esp_options) %2 %{+e*}\
      %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-2009-09-11		Magnus Granberg		<zorry@gentoo.org>
-
-		* 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
-@@ -7134,6 +7134,11 @@
- @opindex fstack-protector-all
- Like @option{-fstack-protector} except that all functions are protected.
+diff -Nur gcc-4.5.0-vanilla/gcc/varasm.c gcc-4.5.0/gcc/varasm.c
+--- gcc-4.5.0-vanilla/gcc/varasm.c	2010-03-27 12:56:30.000000000 +0100
++++ gcc-4.5.0/gcc/varasm.c	2010-04-21 15:21:16.606812404 +0200
+@@ -5961,7 +5961,11 @@
+   bool is_local;
  
-+NOTE: When --enable-esp this option is enabled by default 
-+for C, C++, ObjC, ObjC++, if neither @option{-fno-stack-protector}
-+or @option{-nostdlib} or @option{-nodefaultlibs} or 
-+@option{-fstack-protector} are found.
+   is_local = targetm.binds_local_p (decl);
+-  if (!flag_shlib)
++  #ifdef ENABLE_ESP
++    if (!flag_pic)
++  #else
++    if (!flag_shlib)
++  #endif
+     {
+       if (is_local)
+ 	kind = TLS_MODEL_LOCAL_EXEC;
+diff -Nur gcc-4.5.0-vanilla/libgcc/Makefile.in gcc-4.5.0/libgcc/Makefile.in
+--- gcc-4.5.0-vanilla/libgcc/Makefile.in	2010-03-30 15:08:52.000000000 +0200
++++ gcc-4.5.0/libgcc/Makefile.in	2010-04-21 15:21:10.824811514 +0200
+@@ -291,6 +291,12 @@
+ gen-hide-list = echo > \$@
+ endif
+ 
++# We add crtbeginTS.o to the EXTRA_PARTS list if enable_crtbeginTS = yes
++enable_libgcc_crtbeginTS = $(enable_crtbeginTS)
++ifeq ($(enable_libgcc_crtbeginTS),yes)
++EXTRA_PARTS += crtbeginTS.o
++endif
 +
- @item -fsection-anchors
- @opindex fsection-anchors
- Try to reduce the number of symbolic address calculations by using
-@@ -7960,6 +7965,12 @@
- that were used to generate code (@option{-fpie}, @option{-fPIE},
- or model suboptions) when you specify this option.
+ ifneq ($(EXTRA_PARTS),)
+   extra-parts = libgcc-extra-parts
+   INSTALL_PARTS = $(EXTRA_PARTS)
+@@ -842,6 +848,13 @@
+ crtbeginT.o: $(gcc_srcdir)/crtstuff.c
+ 	$(crt_compile) $(CRTSTUFF_T_CFLAGS) \
+ 	  -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O
++
++# This is a version of crtbegin for -static -fPIE links.
++ifeq ($(enable_libgcc_crtbeginTS),yes)
++crtbeginTS.o: $(gcc_srcdir)/crtstuff.c
++	$(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \
++	  -c $(gcc_srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O
++endif
+ endif
  
-+NOTE: When --enable-esp this option is enabled by default
-+for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
-+or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
-+@option{-nostartfiles} or @option{-shared} or @option{-pg} or @option{-p}
-+are found.
+ # Build extra startfiles in the libgcc directory.
+diff -Nur gcc-4.5.0-vanilla/libmudflap/configure gcc-4.5.0/libmudflap/configure
+--- gcc-4.5.0-vanilla/libmudflap/configure	2009-12-05 18:18:53.000000000 +0100
++++ gcc-4.5.0/libmudflap/configure	2010-04-21 15:21:09.843811773 +0200
+@@ -652,6 +652,7 @@
+ MAINTAINER_MODE_FALSE
+ MAINTAINER_MODE_TRUE
+ am__untar
++enable_esp
+ am__tar
+ AMTAR
+ am__leading_dot
+diff -Nur gcc-4.5.0-vanilla/libmudflap/Makefile.in gcc-4.5.0/libmudflap/Makefile.in
+--- gcc-4.5.0-vanilla/libmudflap/Makefile.in	2010-04-02 20:18:06.000000000 +0200
++++ gcc-4.5.0/libmudflap/Makefile.in	2010-04-21 15:21:10.844815108 +0200
+@@ -304,10 +304,18 @@
+ MAINT_CHARSET = latin1
+ SUBDIRS = testsuite
+ 
++# Some stuff don't compile with PIE or SSP
++enable_esp = @enable_esp@
++ifeq ($(enable_esp),yes)
++NO_ESP_CFLAGS = -fno-stack-protector -U_FORTIFY_SOURCE
++else
++NO_ESP_CFLAGS =
++endif
 +
- @item -rdynamic
- @opindex rdynamic
- Pass the flag @option{-export-dynamic} to the ELF linker, on targets
-@@ -15889,6 +15910,11 @@
- @code{__pie__} and @code{__PIE__}.  The macros have the value 1
- for @option{-fpie} and 2 for @option{-fPIE}.
+ # May be used by various substitution variables.
+ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+-AM_CFLAGS = -Wall $(SECTION_FLAGS)
+-@LIBMUDFLAPTH_FALSE@libmudflapth = 
++AM_CFLAGS = -Wall $(SECTION_FLAGS) $(NO_ESP_CFLAGS)
++@LIBMUDFLAPTH_FALSE@libmudflapth =
+ @LIBMUDFLAPTH_TRUE@libmudflapth = libmudflapth.la
+ toolexeclib_LTLIBRARIES = libmudflap.la $(libmudflapth)
+ libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
+diff -Nur gcc-4.5.0-vanilla/Makefile.in gcc-4.5.0/Makefile.in
+--- gcc-4.5.0-vanilla/Makefile.in	2010-02-17 12:01:44.000000000 +0100
++++ gcc-4.5.0/Makefile.in	2010-04-21 15:21:10.022812548 +0200
+@@ -350,9 +350,17 @@
+ BUILD_PREFIX = @BUILD_PREFIX@
+ BUILD_PREFIX_1 = @BUILD_PREFIX_1@
  
-+NOTE: When --enable-esp this option is enabled by default
-+for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE}
-+or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or
-+@option{-nostartfiles} or @option{-shared} are found.
++# Some stuff don't compile with SSP
++enable_esp = @enable_esp@
++ifeq ($(enable_esp),yes)
++ESP_NOSSP_CFLAGS = -fno-stack-protector
++else
++ESP_NOSSP_CFLAGS=
++endif
 +
- @item -fno-jump-tables
- @opindex fno-jump-tables
- Do not use jump tables for switch statements even where it would be
+ # Flags to pass to stage2 and later makes.  They are defined
+ # here so that they can be overridden by Makefile fragments.
+-BOOT_CFLAGS= -g -O2
++BOOT_CFLAGS= -g -O2 $(ESP_NOSSP_CFLAGS)
+ BOOT_LDFLAGS=
+ BOOT_ADAFLAGS=-gnatpg -gnata
+ 
+@@ -397,9 +405,9 @@
+ 
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBCFLAGS = $(CFLAGS)
++LIBCFLAGS = $(CFLAGS) $(ESP_NOSSP_CFLAGS)
+ CXXFLAGS = @CXXFLAGS@
+-LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
++LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates $(ESP_NOSSP_CFLAGS)
+ 
+ TFLAGS =
+