diff options
author | 2013-08-26 09:13:59 +0000 | |
---|---|---|
committer | 2013-08-26 09:13:59 +0000 | |
commit | 360986c2d73e7bfa55c6ec441ca018dd76b36e0e (patch) | |
tree | 47428a89e7db02aba8a8fb16d37c92e22e784495 /4.8.0 | |
parent | Fix gcc 4.8.1 piepatchset (diff) | |
download | gcc-patches-360986c2d73e7bfa55c6ec441ca018dd76b36e0e.tar.gz gcc-patches-360986c2d73e7bfa55c6ec441ca018dd76b36e0e.tar.bz2 gcc-patches-360986c2d73e7bfa55c6ec441ca018dd76b36e0e.zip |
Fix gcc 4.8.1 piepatchset
Diffstat (limited to '4.8.0')
-rw-r--r-- | 4.8.0/pie/15_all_gcc44_decl-tls-model.patch | 20 | ||||
-rw-r--r-- | 4.8.0/pie/35_all_gcc48_config_arm.patch | 33 | ||||
-rw-r--r-- | 4.8.0/pie/37_all_gcc48_config_ia64.patch | 6 | ||||
-rw-r--r-- | 4.8.0/pie/40_all_gcc48_config_esp.patch | 17 | ||||
-rw-r--r-- | 4.8.0/pie/README.Changelog | 25 | ||||
-rw-r--r-- | 4.8.0/pie/README.history | 6 |
6 files changed, 52 insertions, 55 deletions
diff --git a/4.8.0/pie/15_all_gcc44_decl-tls-model.patch b/4.8.0/pie/15_all_gcc44_decl-tls-model.patch deleted file mode 100644 index 09438a0..0000000 --- a/4.8.0/pie/15_all_gcc44_decl-tls-model.patch +++ /dev/null @@ -1,20 +0,0 @@ -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; - - 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 --git a/4.8.0/pie/35_all_gcc48_config_arm.patch b/4.8.0/pie/35_all_gcc48_config_arm.patch index e50e78e..5aecc6b 100644 --- a/4.8.0/pie/35_all_gcc48_config_arm.patch +++ b/4.8.0/pie/35_all_gcc48_config_arm.patch @@ -1,23 +1,10 @@ -2013-04-01 Magnus Granberg <zorry@gentoo.org> +2013-06-03 Magnus Granberg <zorry@gentoo.org> - * gcc/config/arm/arm.h (SUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. - (DRIVER_SELF_SPECS): Add ESP_DRIVER_SELF_SPEC. + * gcc/config/arm/arm.h (DRIVER_SELF_SPECS): Add ESP_DRIVER_SELF_SPEC. + * gcc/config/arm/elf.h (SUBSUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. --- a/gcc/config/arm/arm.h 2013-01-15 17:17:28.000000000 +0100 +++ b/gcc/config/arm/arm.h 2013-02-18 22:45:18.327284928 +0100 -@@ -226,8 +226,12 @@ extern void (*arm_lang_output_object_att - SUBTARGET_EXTRA_SPECS - - #ifndef SUBTARGET_EXTRA_SPECS -+#ifdef ENABLE_ESP -+#define SUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS -+#else - #define SUBTARGET_EXTRA_SPECS - #endif -+#endif - - #ifndef SUBTARGET_CPP_SPEC - #define SUBTARGET_CPP_SPEC "" @@ -2326,6 +2326,11 @@ extern const char *host_detect_local_cpu # define MCPU_MTUNE_NATIVE_SPECS "" #endif @@ -32,3 +19,17 @@ +# define DRIVER_SELF_SPECS MCPU_MTUNE_NATIVE_SPECS +#endif #endif /* ! GCC_ARM_H */ +--- a/gcc/config/arm/elf.h 2013-01-10 21:38:27.000000000 +0100 ++++ b/gcc/config/arm/elf.h 2013-05-19 02:15:49.595855825 +0200 +@@ -49,7 +49,11 @@ + #endif + + #undef SUBSUBTARGET_EXTRA_SPECS ++#ifdef ENABLE_ESP ++#define SUBSUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS ++#else + #define SUBSUBTARGET_EXTRA_SPECS ++#endif + + #ifndef ASM_SPEC + #define ASM_SPEC "\ diff --git a/4.8.0/pie/37_all_gcc48_config_ia64.patch b/4.8.0/pie/37_all_gcc48_config_ia64.patch index bae8914..ba71922 100644 --- a/4.8.0/pie/37_all_gcc48_config_ia64.patch +++ b/4.8.0/pie/37_all_gcc48_config_ia64.patch @@ -1,6 +1,6 @@ -2013-04-01 Magnus Granberg <zorry@gentoo.org> +2013-06-03 Magnus Granberg <zorry@gentoo.org> - * gcc/config/ia64/linux.h Define DRIVER_SELF_SPECS ESP_DRIVER_SELF_SPECS. + * gcc/config/ia64/linux.h Define DRIVER_SELF_SPECS ESP_DRIVER_SELF_SPEC. * gcc/config/ia64/ia64.h (SUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. --- a/gcc/config/ia64/linux.h 2013-01-10 21:38:27.000000000 +0100 @@ -11,7 +11,7 @@ #define STACK_CHECK_STATIC_BUILTIN 1 + +#ifdef ENABLE_ESP -+#define DRIVER_SELF_SPECS ESP_DRIVER_SELF_SPECS ++#define DRIVER_SELF_SPECS ESP_DRIVER_SELF_SPEC +#endif --- a/gcc/config/ia64/ia64.h 2013-01-10 21:38:27.000000000 +0100 +++ b/gcc/config/ia64/ia64.h 2013-03-26 02:03:21.052061828 +0100 diff --git a/4.8.0/pie/40_all_gcc48_config_esp.patch b/4.8.0/pie/40_all_gcc48_config_esp.patch index 83630f2..805cc2c 100644 --- a/4.8.0/pie/40_all_gcc48_config_esp.patch +++ b/4.8.0/pie/40_all_gcc48_config_esp.patch @@ -1,23 +1,23 @@ -2013-02-14 Magnus Granberg <zorry@gentoo.org> +2013-08-10 Magnus Granberg <zorry@gentoo.org> * gcc/esp.h New file to support --enable-esp - Version 20130214.1 + Version 20130810.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,127 @@ +@@ -0,0 +1,128 @@ +/* License terms see GNU GENERAL PUBLIC LICENSE Version 3. -+ * Version 20130214.1 ++ * Version 20130810.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 ++/* This file will add -fstack-protector-all, -fstack-check, -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. ++ -D__KERNEL__ is added so we don't have -fPIE, -pie and -fstack-protector-all and -fstack-check 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: }}" ++ #define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: %{!fno-stack-check: }}}" + #else + #define ESP_CC1_SSP_SPEC "" + #endif @@ -54,7 +54,8 @@ + #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-protector|fstack-protector-all:;:-fstack-protector-all} \ ++ %{fstack-check|fstack-check=*:;: -fstack-check}" + #else + #define ESP_OPTIONS_SSP_SPEC "" + #endif diff --git a/4.8.0/pie/README.Changelog b/4.8.0/pie/README.Changelog index b73e521..e3ec163 100644 --- a/4.8.0/pie/README.Changelog +++ b/4.8.0/pie/README.Changelog @@ -1,3 +1,12 @@ +0.5.7 Magnus Granberg <zorry@gentoo.org> + + * gcc/config/esp.h Add -fstack-check as default. + +0.5.6 Magnus Granberg <zorry@gentoo.org> + + * gcc/config/ia64/linux.h Change ESP_DRIVER_SELF_SPECS To ESP_DRIVER_SELF_SPEC + * gcc/config/arm/elf.h (SUBSUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. + 0.5.5 Magnus Granberg <zorry@gentoo.org> * configure.ac Add mips @@ -8,19 +17,19 @@ * gcc/Makefile.in Bumped for 4.8.0 release * gcc/gcc.c Remove ESP_EXTRA_SPECS and ESP_COMMAND_OPTIONS_SPEC - * gcc/config/rs6000/sysv4.h Add ESP_DRIVER_SELF_SPECS + * gcc/config/rs6000/sysv4.h Add ESP_DRIVER_SELF_SPEC and ESP_EXTRA_SPECS - * gcc/config/i386/gnu-user-common.h Add ESP_DRIVER_SELF_SPECS - * gcc/config/i386/gnu-user.h Add ESP_DRIVER_SELF_SPECS - * gcc/config/i386/i386.h Add ESP_DRIVER_SELF_SPECS - * gcc/config/arm/arm.h Add ESP_DRIVER_SELF_SPECS and + * gcc/config/i386/gnu-user-common.h Add ESP_DRIVER_SELF_SPEC + * gcc/config/i386/gnu-user.h Add ESP_DRIVER_SELF_SPEC + * gcc/config/i386/i386.h Add ESP_DRIVER_SELF_SPEC + * gcc/config/arm/arm.h Add ESP_DRIVER_SELF_SPEC and ESP_EXTRA_SPECS - * gcc/config/mips/gnu-user.h Add ESP_DRIVER_SELF_SPECS - * gcc/config/mips/gnu-user64.h Add ESP_DRIVER_SELF_SPECS + * gcc/config/mips/gnu-user.h Add ESP_DRIVER_SELF_SPEC + * gcc/config/mips/gnu-user64.h Add ESP_DRIVER_SELF_SPEC * gcc/config/mips/mips.h Add ESP_EXTRA_SPECS * gcc/config/ia64/linux.h Add ESP_DRIVER_SELF_SPECS * gcc/config/ia64/ia64.h Add ESP_EXTRA_SPECS - * gcc/config/esp.h Bump for ESP_DRIVER_SELF_SPECS support + * gcc/config/esp.h Bump for ESP_DRIVER_SELF_SPEC support 0.5.4 Magnus Granberg <zorry@gentoo.org> diff --git a/4.8.0/pie/README.history b/4.8.0/pie/README.history index 5a2a379..18bdd75 100644 --- a/4.8.0/pie/README.history +++ b/4.8.0/pie/README.history @@ -1,3 +1,9 @@ +0.5.7 10 Jul 2013 + U 35_all_gcc48_config_esp.h.patches + - 15_all_gcc44_decl-tls-model.patch +0.5.6 03 Jun 2013 + U 35_all_gcc48_config_arm.patches + U 37_all_gcc48_config_ia64.patch 0.5.5 31 Mar 2013 - 01_all_gcc47_configure.patch + 01_all_gcc48_configure.patch |