diff options
| author |   Magnus Granberg (Zorry) <zorry@gentoo.org> | 2010-04-20 12:33:57 +0200 |
|---|---|---|
| committer | Magnus Granberg (Zorry) <zorry@gentoo.org> | 2010-04-20 12:33:57 +0200 |
| commit | d11ffe8f42d2c9dacea32952d738e649000be1da (patch) | |
| tree | 5e52a647b4500bef5062987d010c14b9398f19c8 | |
| parent | fix some typos in gcc-4.4.3/piepatch/ esp.h.patch part2 (diff) | |
| download | hardened-gccpatchset-d11ffe8f42d2c9dacea32952d738e649000be1da.tar.gz hardened-gccpatchset-d11ffe8f42d2c9dacea32952d738e649000be1da.tar.bz2 hardened-gccpatchset-d11ffe8f42d2c9dacea32952d738e649000be1da.zip | |
fix some typos in gcc-4.4.3/piepatch
4 files changed, 6 insertions, 6 deletions
diff --git a/gcc-4.4.3/piepatch/10_all_gcc44_configure.patch b/gcc-4.4.3/piepatch/10_all_gcc44_configure.patch index bc12818..722a284 100644 --- a/gcc-4.4.3/piepatch/10_all_gcc44_configure.patch +++ b/gcc-4.4.3/piepatch/10_all_gcc44_configure.patch @@ -244,7 +244,7 @@ +_ACEOF + +fi -+if test x$enable_espf = xyes && test x$enable_esp_ld = xno; then ++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;} + { (exit 1); exit 1; }; } diff --git a/gcc-4.4.3/piepatch/12_all_gcc44_Makefile.in.patch b/gcc-4.4.3/piepatch/12_all_gcc44_Makefile.in.patch index 50fcc1b..9c43a4f 100644 --- a/gcc-4.4.3/piepatch/12_all_gcc44_Makefile.in.patch +++ b/gcc-4.4.3/piepatch/12_all_gcc44_Makefile.in.patch @@ -15,7 +15,7 @@ LP #344502 * libmudflap/Makefiles.in Add -fno-stack-protector -U_FORTIFY_SOURCE - to AM_CFLAGS if enable_espf yes. + to AM_CFLAGS if enable_esp yes. --- Makefile.in 2009-04-14 10:57:33.000000000 +0200 +++ Makefile.in 2009-07-21 05:29:54.000000000 +0200 @@ -134,7 +134,7 @@ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFT_O \ -o $(T)crtbeginT$(objext) -+# This is a version of crtbegin for -static -fPIE links if espf is enable. ++# 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) diff --git a/gcc-4.4.3/piepatch/20_all_gcc44_gcc.c.patch b/gcc-4.4.3/piepatch/20_all_gcc44_gcc.c.patch index f86c7b2..a4a0ce2 100644 --- a/gcc-4.4.3/piepatch/20_all_gcc44_gcc.c.patch +++ b/gcc-4.4.3/piepatch/20_all_gcc44_gcc.c.patch @@ -2,7 +2,7 @@ * gcc/gcc.c include esp.h static const char *cc1_spec We set that in esp.h if ENABLE_ESP. - *cc1_options Add espf_options_pie_check if ENABLE_ESP. + *cc1_options Add esp_options_pie_check if ENABLE_ESP. #ifdef EXTRA_SPECS: Add ESP_EXTRA_SPECS main(): Add do_self_spec esp_command_options_spec() @@ -58,7 +58,7 @@ %(cpp_options) -o %{save-temps:%b.i} %{!save-temps:%g.i} \n\ cc1 -fpreprocessed %{save-temps:%b.i} %{!save-temps:%g.i} \ - %(cc1_options)}\ -+ %(cc1_options) %(espf_options)}\ ++ %(cc1_options) %(esp_options)}\ %{!save-temps:%{!traditional-cpp:%{!no-integrated-cpp:\ - cc1 %(cpp_unique_options) %(cc1_options)}}}\ + cc1 %(cpp_unique_options) %(cc1_options) %(esp_options)}}}\ diff --git a/gcc-4.4.3/piepatch/41_all_gcc44_objc_lang-specs.h.patch b/gcc-4.4.3/piepatch/41_all_gcc44_objc_lang-specs.h.patch index 24c7e21..418217e 100644 --- a/gcc-4.4.3/piepatch/41_all_gcc44_objc_lang-specs.h.patch +++ b/gcc-4.4.3/piepatch/41_all_gcc44_objc_lang-specs.h.patch @@ -1,7 +1,7 @@ 2009-06-18 Matthias Klose <doko@ubuntu.com>, Kees Cook <kees@outflux.net> LP #346126 - * gcc/objc/lang-specs.h compiler spec Add %(espf_options). + * 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 |