diff options
| author |   Magnus Granberg <zorry@gentoo.org> | 2012-07-08 23:35:30 +0200 |
|---|---|---|
| committer | Magnus Granberg <zorry@gentoo.org> | 2012-07-08 23:35:30 +0200 |
| commit | f75c7f873e548b69686fcff48519d8edb8ddeb32 (patch) | |
| tree | 9e498a19f04028d0131911d16aadda69a9f86c79 /upstream/gcc.c.patch | |
| parent | Fix a typo in the ssp_uclibc_check patch tag 0.5.2 (diff) | |
| download | hardened-gccpatchset-f75c7f873e548b69686fcff48519d8edb8ddeb32.tar.gz hardened-gccpatchset-f75c7f873e548b69686fcff48519d8edb8ddeb32.tar.bz2 hardened-gccpatchset-f75c7f873e548b69686fcff48519d8edb8ddeb32.zip | |
Updete of the upstrem patches
Diffstat (limited to 'upstream/gcc.c.patch')
| -rw-r--r-- | upstream/gcc.c.patch | 43 |
1 files changed, 16 insertions, 27 deletions
diff --git a/upstream/gcc.c.patch b/upstream/gcc.c.patch index b1d5e89..556f0a5 100644 --- a/upstream/gcc.c.patch +++ b/upstream/gcc.c.patch @@ -1,28 +1,17 @@ -2011-06-24 Magnus Granberg <zorry@gentoo.org> - - * gcc/gcc.c include esp.h - main(): Add do_self_spec (espf_command_options_spec) - ---- gcc/gcc.c 2010-01-21 10:29:30.000000000 -0500 -+++ gcc/gcc.c 2010-01-29 23:29:16.000000000 -0500 -@@ -44,6 +44,7 @@ - #include "flags.h" - #include "opts.h" - #include "vec.h" -+#include "esp.h" /* for --enable-espf support */ - - /* By default there is no special suffix for target executables. */ - /* FIXME: when autoconf is fixed, remove the host check - dj */ -@@ -7096,6 +7123,12 @@ - gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str, - spec_version, dir_separator_str, NULL); - -+#ifdef ENABLE_ESPF -+ /* Process ESPF_COMMAND_OPTIONS_SPEC, adding any new options to the end -+ of the command line. */ -+ do_self_spec (espf_command_options_spec); +--- a/gcc/gcc.c 2012-02-28 18:31:38.000000000 +0100 ++++ b/gcc/gcc.c 2012-07-06 17:03:20.505842011 +0200 +@@ -756,9 +756,11 @@ static const char *cpp_unique_options = + %{!iplugindir*:%{fplugin*:%:find-plugindir()}}\ + %{H} %C %{D*&U*&A*} %{i*} %Z %i\ + %{fmudflap:-D_MUDFLAP -include mf-runtime.h}\ +- %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h}\ +- %{E|M|MM:%W{o*}}"; +- ++ %{fmudflapth:-D_MUDFLAP -D_MUDFLAPTH -include mf-runtime.h} " ++#ifdef ENABLE_ESPF_FORTIFY ++"%(espf_cpp_unique_options) " +#endif -+ - /* Now we have the specs. - Set the `valid' bits for switches that match anything in any spec. */ - ++"%{E|M|MM:%W{o*}}"; + /* This contains cpp options which are common with cc1_options and are passed + only when preprocessing only to avoid duplication. We pass the cc1 spec + options to the preprocessor so that it the cc1 spec may manipulate |