diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-12-26 11:07:31 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-26 11:08:38 +0000 |
| commit | 16dfeac411098e18ef450ab740a5a71c51bc41b0 (patch) | |
| tree | 35fcd3329b571642a27763f0083c7f9f22030e0f /main/gcc/40_all_gcc48_config_esp.patch | |
| parent | d718403aebb2e68c5271c75469a23f671b321fb0 (diff) | |
| download | aports-16dfeac411098e18ef450ab740a5a71c51bc41b0.tar.bz2 aports-16dfeac411098e18ef450ab740a5a71c51bc41b0.tar.xz | |
main/gcc: revert gentoo's addition of -fstack-check
I disagree, we don't want it as default.
Diffstat (limited to 'main/gcc/40_all_gcc48_config_esp.patch')
| -rw-r--r-- | main/gcc/40_all_gcc48_config_esp.patch | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/main/gcc/40_all_gcc48_config_esp.patch b/main/gcc/40_all_gcc48_config_esp.patch index 1612d8177..83630f2e7 100644 --- a/main/gcc/40_all_gcc48_config_esp.patch +++ b/main/gcc/40_all_gcc48_config_esp.patch @@ -1,23 +1,23 @@ -2013-08-10 Magnus Granberg <zorry@gentoo.org> +2013-02-14 Magnus Granberg <zorry@gentoo.org> * gcc/esp.h New file to support --enable-esp - Version 20130810.1 + Version 20130214.1 ---- ./gcc/config/esp.h 2010-04-09 16:14:00.000000000 +0200 -+++ ./gcc/config/esp.h 2012-06-23 01:00:31.248348491 +0200 -@@ -0,0 +1,128 @@ +--- gcc/config/esp.h 2010-04-09 16:14:00.000000000 +0200 ++++ gcc/config/esp.h 2012-06-23 01:00:31.248348491 +0200 +@@ -0,0 +1,127 @@ +/* License terms see GNU GENERAL PUBLIC LICENSE Version 3. -+ * Version 20130810.1 ++ * Version 20130214.1 + * Magnus Granberg (Zorry) <zorry@gentoo.org> */ +#ifndef GCC_ESP_H +#define GCC_ESP_H + -+/* This file will add -fstack-protector-all, -fstack-check, -fPIE, -pie and -z now ++/* 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 and -fstack-check when building kernels. ++ -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. @@ -28,7 +28,7 @@ + /* 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: %{!fno-stack-check: }}}" ++ #define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: }}" + #else + #define ESP_CC1_SSP_SPEC "" + #endif @@ -54,8 +54,7 @@ + #if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP ) + #define ESP_OPTIONS_SSP_SPEC \ + "%{nostdlib|nodefaultlibs|fno-stack-protector| \ -+ fstack-protector|fstack-protector-all:;:-fstack-protector-all} \ -+ %{fstack-check|fstack-check=*:;: -fstack-check}" ++ fstack-protector|fstack-protector-all:;:-fstack-protector-all}" + #else + #define ESP_OPTIONS_SSP_SPEC "" + #endif |