diff options
author | 2011-12-22 21:18:52 +0100 | |
---|---|---|
committer | 2011-12-22 21:18:52 +0100 | |
commit | fb1940a404ba2fdb87572b754815d39fa14a2c96 (patch) | |
tree | 0e606ab4182623b41bc0acc4ee962eab385284b4 | |
parent | Fix bugs 380823 and 393321 part3 (diff) | |
download | hardened-gccpatchset-fb1940a404ba2fdb87572b754815d39fa14a2c96.tar.gz hardened-gccpatchset-fb1940a404ba2fdb87572b754815d39fa14a2c96.tar.bz2 hardened-gccpatchset-fb1940a404ba2fdb87572b754815d39fa14a2c96.zip |
update it to 0.4.7 fix 394821
-rw-r--r-- | gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch | 18 | ||||
-rw-r--r-- | gcc-4.5.0/piepatch/README.Changelog | 6 | ||||
-rw-r--r-- | gcc-4.5.0/piepatch/README.history | 62 | ||||
-rw-r--r-- | upstream/configure.ac.patch | 2 |
4 files changed, 59 insertions, 29 deletions
diff --git a/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch b/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch index a1f1cd1..c3e18bd 100644 --- a/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch +++ b/gcc-4.5.0/piepatch/12_all_gcc45_Makefile.in.patch @@ -1,4 +1,4 @@ -2011-12-06 Magnus Granberg <zorry@gentoo.org> Anthony G. Basile <basile@opensource.dyc.edu> +2011-12-21 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. @@ -99,6 +99,22 @@ # List of extra object files that should be compiled and linked with # compiler proper (cc1, cc1obj, cc1plus). EXTRA_OBJS = @extra_objs@ +@@ -1002,12 +1010,12 @@ + + # This is the variable actually used when we compile. If you change this, + # you probably want to update BUILD_CFLAGS in configure.ac +-ALL_CFLAGS = $(T_CFLAGS) \ ++ALL_CFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) \ + $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@ + + # The C++ version. +-ALL_CXXFLAGS = $(T_CFLAGS) $(CXXFLAGS) $(INTERNAL_CFLAGS) \ +- $(COVERAGE_FLAGS) $(WARN_CXXFLAGS) @DEFS@ ++ALL_CXXFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CXXFLAGS) \ ++ $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CXXFLAGS) @DEFS@ + + # Likewise. Put INCLUDES at the beginning: this way, if some autoconf macro + # puts -I options in CPPFLAGS, our include files in the srcdir will always @@ -1856,9 +1873,10 @@ echo LIBGCC_SYNC = '$(LIBGCC_SYNC)' >> tmp-libgcc.mvars echo LIBGCC_SYNC_CFLAGS = '$(LIBGCC_SYNC_CFLAGS)' >> tmp-libgcc.mvars diff --git a/gcc-4.5.0/piepatch/README.Changelog b/gcc-4.5.0/piepatch/README.Changelog index 53b7b44..aaecc31 100644 --- a/gcc-4.5.0/piepatch/README.Changelog +++ b/gcc-4.5.0/piepatch/README.Changelog @@ -1,3 +1,9 @@ +0.4.7 Magnus Granberg <zorry@gentoo.org> + + #394821 #380823 (ported from 4.6) + * gcc/Makefile.in added ESP_NOPIE_CFLAGS to ALL_CXXFLAGS + and ALL_CFLAGS + 0.4.6 Magnus Granberg <zorry@gentoo.org> #393321 diff --git a/gcc-4.5.0/piepatch/README.history b/gcc-4.5.0/piepatch/README.history index a226a3b..aa5eae5 100644 --- a/gcc-4.5.0/piepatch/README.history +++ b/gcc-4.5.0/piepatch/README.history @@ -1,4 +1,7 @@ -0.4.6 06-12-2011 +0.4.7 21 Dec 2011 + U 12_all_gcc45_Makefile.in.patch + +0.4.6 06 Dec 2011 + 35_all_gcc45_config_crtbeginp.patch - 35_all_gcc44_config_crtbegints.patch U 10_all_gcc45_configure.patch @@ -7,25 +10,30 @@ - 11_all_gcc44_config.in.patch + 30_all_gcc45_esp.h.patch - 30_all_gcc44_esp.h.patch -0.4.5 18-06-2010 + +0.4.5 18 Jun 2010 U 35_all_gcc44_config_crtbegints.patch -0.4.4 26-05-2010 + +0.4.4 26 May 2010 U 30_all_gcc44_esp.h.patch -0.4.3 26-05-2010 + +0.4.3 26 May 2010 U 20_all_gcc44_gcc.c.patch U 30_all_gcc44_esp.h.patch -0.4.2 24-05-2010 + +0.4.2 24 May 2010 U 10_all_gcc44_configure.patch U 12_all_gcc44_Makefile.in.patch U 11_all_gcc44_config.in.patch U 30_all_gcc44_esp.h.patch -0.4.1 29-04-2010 + +0.4.1 29 Apr 2010 U 10_all_gcc45_configure.patch U 12_all_gcc45_Makefile.in.patch U 11_all_gcc44_config.in.patch U 30_all_gcc44_esp.h.patch -0.4.0 19-04-2010 +0.4.0 19 Apr 2010 U 10_all_gcc45_configure.patch U 12_all_gcc45_Makefile.in.patch U 11_all_gcc44_config.in.patch @@ -33,23 +41,23 @@ - 30_all_gcc44_espf.h.patch + 30_all_gcc44_esp.h.patch -0.3.9 14-04-2010 +0.3.9 14 Apr 2010 U 10_all_gcc45_configure.patch - 50_all_gcc44_no_ssp_tls_uclibc.patch U 33_all_gcc45_config_rs6000_linux64.h.patch -0.3.8 10-04-2010 +0.3.8 10 Apr 2010 10_all_gcc44_configure.patch 11_all_gcc44_config.in.patch 20_all_gcc44_gcc.c.patch 30_all_gcc44_espf.h.patch -0.3.7 10-02-2010 +0.3.7 10 Feb 2010 20_all_gcc44_gcc.c.patch 30_all_gcc44_espf.h.patch 10_all_gcc44_configure.patch -0.3.6 23-12-2009 +0.3.6 23 Dec 2009 - 10_all_gcc44_configure.patch + 10_all_gcc44_configure.patch - 30_all_gcc44_espf.h.patch @@ -61,7 +69,7 @@ - README + README -0.3.5 24-09-2009 +0.3.5 24 Sep 2009 - 30_all_gcc44_espf.h.patch + 30_all_gcc44_espf.h.patch - 35_all_gcc44_config_crtbegints.patch @@ -73,7 +81,7 @@ + README.history + README.Gentoo.patches -0.3.4 11-09-2009 +0.3.4 11 Sep 2009 - 10_all_gcc44_configure.patch + 10_all_gcc44_configure.patch - 11_all_gcc44_config.in.patch @@ -94,11 +102,11 @@ - README + README -0.3.3 14-08-2009 +0.3.3 14 Aug 2009 - 23_all_gcc44_opts.c.patch + 23_all_gcc44_opts.c.patch -0.3.2 09-08-2009 +0.3.2 09 Aug 2009 + 50_all_gcc44_no_ssp_tls_uclibc.patch + README.Changelog + README.history @@ -107,11 +115,11 @@ - 30_all_gcc44-espf.h.patch + 30_all_gcc44-espf.h.patch -0.3.1 23-07-2009 +0.3.1 23 Jul 2009 - 10_all_gcc44_configure.patch + 10_all_gcc44_configure.patch -0.3.0 23-07-2009 +0.3.0 23 Jul 2009 - 10_all_gcc44_configure.patch + 10_all_gcc44_configure.patch - 11_all_gcc44_config.in.patch @@ -127,7 +135,7 @@ - 30_all_gcc44-espf.h.patch + 30_all_gcc44-espf.h.patch -0.2.9 14-06-2009 +0.2.9 14 Jun 2009 - 12_all_gcc44_Makefile.in.patch + 12_all_gcc44_Makefile.in.patch - 30_all_gcc44-espf.h.patch @@ -135,7 +143,7 @@ - 50_all_gcc44_gentoo_v20090612.2.patch + 50_all_gcc44_gentoo_v20090614.1.patch -0.2.8 12-06-2009 +0.2.8 12 Jun 2009 - 10_all_gcc44_configure.patch + 10_all_gcc44_configure.patch - 11_all_gcc44_config.in.patch @@ -147,7 +155,7 @@ + 30_all_gcc44-espf.h.patch + 50_all_gcc44_gentoo_v20090612.2.patch -0.2.7 29-05-2009 +0.2.7 29 May 2009 - 11_all_gcc44_config.in.patch + 11_all_gcc44_config.in.patch - 12_all_gcc44_Makefile.in.patch @@ -159,14 +167,14 @@ + 25_all_gcc44-espf.h.patch - 30_all_gcc44-config-defaul-linux.patch -0.2.6 28-05-2009 +0.2.6 28 May 2009 + 22_all_gcc44-toplev.c.patch - 25_all_gcc44-espf.h.patch + 25_all_gcc44-espf.h.patch - 30_all_gcc44-config-defaul-linux.patch + 30_all_gcc44-config-defaul-linux.patch -0.2.5 27-05-2009 +0.2.5 27 May 2009 - 10_all_gcc44_configure.patch + 10_all_gcc44_configure.patch - 12_all_gcc44_Makefile.in.patch @@ -179,17 +187,17 @@ + 30_all_gcc44-config-defaul-linux.patch - 40_all_gcc44-gentoo.patch -0.2.4 08-05-2009 +0.2.4 08 May 2009 - 12_all_gcc44_Makefile.in.patch + 12_all_gcc44_Makefile.in.patch -0.2.3 08-05-2009 +0.2.3 08 May 2009 - 20_all_gcc44_gcc.c.patch + 20_all_gcc44_gcc.c.patch - 40_all_gcc44-gentoo.patch + 40_all_gcc44-gentoo.patch -0.2.2 04-05-2009 +0.2.2 04 May 2009 + 10_all_gcc44_configure.patch + 11_all_gcc44_config.in.patch + 12_all_gcc44_Makefile.in.patch @@ -211,7 +219,7 @@ - 23_all_gcc44-gcc_varasm.c.patch - 30_all_gcc44-add-crt-start-endfiles-linux.patch -0.2.1 28-04-2009 +0.2.1 28 Apr 2009 + 01_all_gcc44-configure.patch + 10_all_gcc44-gcc_configure.patch + 11_all_gcc44-gcc_config.in.patch @@ -232,7 +240,7 @@ - 20-all_gcc4.4-default-crt-start-endfile.patch - 30-all_gcc4.4-crtbeginTS-fno-PIE.patch -0.1.0 16.04.2009 +0.1.0 16 Apr 2009 + 00_all_gcc4.4-cvs-incompat.patch + 05_all_gcc4.4-compile-no-ssp.patch + 10_all_gcc4.4-hardened-minispecs-support.patch diff --git a/upstream/configure.ac.patch b/upstream/configure.ac.patch index 396cd0e..b08edcc 100644 --- a/upstream/configure.ac.patch +++ b/upstream/configure.ac.patch @@ -19,7 +19,7 @@ + Linux targets supported x86_64.])], +[ + case $target in -+ x86_64*-*-linux*) ++ i?86*-*-linux* | x86_64*-*-linux* | x86_x32*-*-linux | powerpc-*-linux* | powerpc64-*-linux* | arm*-*-linux* | ia64-*-linux*) + enable_espf=yes + ;; + *) |