[gcc-7] 134/354: - fix a syntax error
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository gcc-7.
commit bce54dbe7e649813f33a884360a0b924cf511990
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Fri Mar 3 11:26:23 2017 +0000
- fix a syntax error
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9335 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/patches/gcc-default-format-security.diff | 2 +-
debian/patches/gcc-default-ssp-strong.diff | 2 +-
debian/patches/gcc-default-ssp.diff | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/debian/patches/gcc-default-format-security.diff b/debian/patches/gcc-default-format-security.diff
index f2aed57..1e15979 100644
--- a/debian/patches/gcc-default-format-security.diff
+++ b/debian/patches/gcc-default-format-security.diff
@@ -28,7 +28,7 @@ Index: b/src/gcc/gcc.c
+#define FORMAT_SECURITY_SPEC "%{!Wformat:%{!Wformat=2:%{!Wformat=0:%{!Wall:-Wformat} %{!Wno-format-security:-Wformat-security}}}}"
+
#ifndef SSP_DEFAULT_SPEC
- #if defined(TARGET_LIBC_PROVIDES_SSP) && !defined/ACCEL_COMPILER)
+ #if defined(TARGET_LIBC_PROVIDES_SSP) && !defined(ACCEL_COMPILER)
-#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
diff --git a/debian/patches/gcc-default-ssp-strong.diff b/debian/patches/gcc-default-ssp-strong.diff
index 06f4d89..d69e477 100644
--- a/debian/patches/gcc-default-ssp-strong.diff
+++ b/debian/patches/gcc-default-ssp-strong.diff
@@ -7,7 +7,7 @@ Index: b/src/gcc/gcc.c
@@ -872,7 +872,7 @@ proper position among the other output f
#ifndef SSP_DEFAULT_SPEC
- #if defined(TARGET_LIBC_PROVIDES_SSP) && !defined/ACCEL_COMPILER)
+ #if defined(TARGET_LIBC_PROVIDES_SSP) && !defined(ACCEL_COMPILER)
-#define SSP_DEFAULT_SPEC "%{!fno-stack-protector:%{!fstack-protector-all:%{!ffreestanding:%{!nostdlib:-fstack-protector}}}} " FORMAT_SECURITY_SPEC
+#define SSP_DEFAULT_SPEC "%{!fno-stack-protector:%{!fstack-protector-all:%{!ffreestanding:%{!nostdlib:%{!fstack-protector:-fstack-protector-strong}}}}} " FORMAT_SECURITY_SPEC
#else
diff --git a/debian/patches/gcc-default-ssp.diff b/debian/patches/gcc-default-ssp.diff
index 3786d10..ff81165 100644
--- a/debian/patches/gcc-default-ssp.diff
+++ b/debian/patches/gcc-default-ssp.diff
@@ -19,7 +19,7 @@ Index: b/src/gcc/gcc.c
#endif
+#ifndef SSP_DEFAULT_SPEC
-+#if defined(TARGET_LIBC_PROVIDES_SSP) && !defined/ACCEL_COMPILER)
++#if defined(TARGET_LIBC_PROVIDES_SSP) && !defined(ACCEL_COMPILER)
+#define SSP_DEFAULT_SPEC "%{!fno-stack-protector:%{!fstack-protector-all:%{!ffreestanding:%{!nostdlib:-fstack-protector}}}}"
+#else
+#define SSP_DEFAULT_SPEC ""
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git
More information about the Reproducible-commits
mailing list