From a44df2af465660e2c3cd05328d4b855b50dc8e8e Mon Sep 17 00:00:00 2001 From: Magnus Granberg Date: Sun, 8 Apr 2012 15:00:05 +0200 Subject: Updated config.in patch for upstream --- upstream/config.in.patch | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/upstream/config.in.patch b/upstream/config.in.patch index 89f5ec4..7bd846e 100644 --- a/upstream/config.in.patch +++ b/upstream/config.in.patch @@ -1,12 +1,11 @@ -2010-06-24 Magnus Granberg +2012-04-08 Magnus Granberg - * gcc/config.in Add ENABLE_ESPF, ENABLE_ESPF_FORTIFY - ENABLE_ESPF_NOW, ENABLE_ESPF_PIE, ENABLE_ESPF_RELRO - and ENABLE_ESPF_SSP + * gcc/config.in Add ENABLE_ESPF, ENABLE_ESPF_FORTIFY, + ENABLE_ESPF_PIE and ENABLE_ESPF_SSP --- a/gcc/config.in 2011-04-24 00:36:52.000000000 +0200 +++ b/gcc/config.in 2011-06-24 14:17:05.166236726 +0200 -@@ -77,6 +77,41 @@ +@@ -77,6 +77,29 @@ #endif @@ -22,24 +21,12 @@ +#endif + + -+/* Define to 1 to enable espf with -z now when linking. */ -+#ifndef USED_FOR_TARGET -+#undef ENABLE_ESPF_NOW -+#endif -+ -+ +/* Define to 1 to enable espf with -fPIE -pie. */ +#ifndef USED_FOR_TARGET +#undef ENABLE_ESPF_PIE +#endif + + -+/* Define to 1 to enable espf with -z relro when linking. */ -+#ifndef USED_FOR_TARGET -+#undef ENABLE_ESPF_RELRO -+#endif -+ -+ +/* Define to 1 to enable espf with -fstack-protector. */ +#ifndef USED_FOR_TARGET +#undef ENABLE_ESPF_SSP -- cgit v1.2.3-65-gdbad