diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-18 23:21:24 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2014-05-18 23:21:24 +0000 |
| commit | 632919f6950444ff5d97419697ec736c1f0f0b51 (patch) | |
| tree | 37fbcf84ffac1a7b674036e2a636ff33e2076ec4 /debian | |
| parent | 58f21a5467a7004a8c730d5597f7858eb92b3b75 (diff) | |
| download | gcc-49-632919f6950444ff5d97419697ec736c1f0f0b51.tar.gz | |
- Regenerate gcc-default-format-security.diff
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.9@7389 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/gcc-default-format-security.diff | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/debian/patches/gcc-default-format-security.diff b/debian/patches/gcc-default-format-security.diff index fc0c4df..ddd8f65 100644 --- a/debian/patches/gcc-default-format-security.diff +++ b/debian/patches/gcc-default-format-security.diff @@ -4,7 +4,7 @@ Index: b/src/gcc/doc/invoke.texi =================================================================== --- a/src/gcc/doc/invoke.texi +++ b/src/gcc/doc/invoke.texi -@@ -3351,6 +3351,11 @@ +@@ -3572,6 +3572,11 @@ in future warnings may be added to @option{-Wformat-security} that are not included in @option{-Wformat-nonliteral}.) @@ -16,9 +16,11 @@ Index: b/src/gcc/doc/invoke.texi @item -Wformat-y2k @opindex Wformat-y2k @opindex Wno-format-y2k +Index: b/src/gcc/gcc.c +=================================================================== --- a/src/gcc/gcc.c +++ b/src/gcc/gcc.c -@@ -654,11 +654,14 @@ +@@ -665,11 +665,14 @@ #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G" #endif @@ -27,8 +29,8 @@ Index: b/src/gcc/doc/invoke.texi + #ifndef SSP_DEFAULT_SPEC #ifdef TARGET_LIBC_PROVIDES_SSP --#define SSP_DEFAULT_SPEC "%{!fno-stack-protector:%{!fstack-protector-all:%{!ffreestanding:%{!nostdlib:%{!fstack-protector:-fstack-protector-strong}}}}}" -+#define SSP_DEFAULT_SPEC "%{!fno-stack-protector:%{!fstack-protector-all:%{!ffreestanding:%{!nostdlib:%{!fstack-protector:-fstack-protector-strong}}}}} " FORMAT_SECURITY_SPEC +-#define SSP_DEFAULT_SPEC "%{!fno-stack-protector:%{!fstack-protector-all:%{!ffreestanding:%{!nostdlib:-fstack-protector}}}}" ++#define SSP_DEFAULT_SPEC "%{!fno-stack-protector:%{!fstack-protector-all:%{!ffreestanding:%{!nostdlib:-fstack-protector}}}}" FORMAT_SECURITY_SPEC #else -#define SSP_DEFAULT_SPEC "" +#define SSP_DEFAULT_SPEC FORMAT_SECURITY_SPEC |