[gcc-7] 132/354: - don't apply gcc-default-* changes for accel compilers
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:41 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 28b5a350582b7f66594771212bccf004f187ee34
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Fri Mar 3 09:02:09 2017 +0000
- don't apply gcc-default-* changes for accel compilers
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9333 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/patches/bind_now_when_pie.diff | 7 +++++--
debian/patches/gcc-default-format-security.diff | 10 +++++-----
debian/patches/gcc-default-fortify-source.diff | 6 ++++--
debian/patches/gcc-default-ssp-strong.diff | 10 +++++-----
debian/patches/gcc-default-ssp.diff | 18 +++++++++---------
5 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/debian/patches/bind_now_when_pie.diff b/debian/patches/bind_now_when_pie.diff
index 516a164..4fe24fe 100644
--- a/debian/patches/bind_now_when_pie.diff
+++ b/debian/patches/bind_now_when_pie.diff
@@ -9,12 +9,15 @@ Index: b/src/gcc/gcc.c
===================================================================
--- a/src/gcc/gcc.c
+++ b/src/gcc/gcc.c
-@@ -930,7 +930,7 @@ proper position among the other output f
+@@ -936,7 +936,11 @@ proper position among the other output f
#ifndef LINK_PIE_SPEC
#ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC
--#define LD_PIE_SPEC "-pie"
++#ifdef ACCEL_COMPILER
+ #define LD_PIE_SPEC "-pie"
++#else
+#define LD_PIE_SPEC "-pie -z now"
++#endif
#endif
#else
#define LD_PIE_SPEC ""
diff --git a/debian/patches/gcc-default-format-security.diff b/debian/patches/gcc-default-format-security.diff
index f82ff5e..f2aed57 100644
--- a/debian/patches/gcc-default-format-security.diff
+++ b/debian/patches/gcc-default-format-security.diff
@@ -4,9 +4,9 @@ Index: b/src/gcc/doc/invoke.texi
===================================================================
--- a/src/gcc/doc/invoke.texi
+++ b/src/gcc/doc/invoke.texi
-@@ -3799,6 +3799,11 @@ included in @option{-Wformat-nonliteral}
- If @option{-Wformat} is specified, also warn if the format string
- requires an unsigned argument and the argument is signed and vice versa.
+@@ -4119,6 +4119,11 @@ value is used and that might result in t
+ sufficient length or magnitude.
+ @end table
+NOTE: In Ubuntu 8.10 and later versions this option is enabled by default
+for C, C++, ObjC, ObjC++. To disable, use @option{-Wno-format-security},
@@ -20,7 +20,7 @@ Index: b/src/gcc/gcc.c
===================================================================
--- a/src/gcc/gcc.c
+++ b/src/gcc/gcc.c
-@@ -858,11 +858,14 @@ proper position among the other output f
+@@ -867,11 +867,14 @@ proper position among the other output f
#define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
#endif
@@ -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
- #ifdef TARGET_LIBC_PROVIDES_SSP
+ #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-fortify-source.diff b/debian/patches/gcc-default-fortify-source.diff
index d3ab164..74d7ed0 100644
--- a/debian/patches/gcc-default-fortify-source.diff
+++ b/debian/patches/gcc-default-fortify-source.diff
@@ -10,7 +10,7 @@ Index: b/src/gcc/doc/invoke.texi
===================================================================
--- a/src/gcc/doc/invoke.texi
+++ b/src/gcc/doc/invoke.texi
-@@ -7840,6 +7840,12 @@ also turns on the following optimization
+@@ -7105,6 +7105,12 @@ also turns on the following optimization
Please note the warning under @option{-fgcse} about
invoking @option{-O2} on programs that use computed gotos.
@@ -27,13 +27,15 @@ Index: b/src/gcc/c-family/c-cppbuiltin.c
===================================================================
--- a/src/gcc/c-family/c-cppbuiltin.c
+++ b/src/gcc/c-family/c-cppbuiltin.c
-@@ -1176,6 +1176,10 @@ c_cpp_builtins (cpp_reader *pfile)
+@@ -1335,6 +1335,12 @@ c_cpp_builtins (cpp_reader *pfile)
builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0);
builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0);
++#if !defined(ACCEL_COMPILER)
+ /* Fortify Source enabled by default for optimization levels > 0 */
+ if (optimize)
+ builtin_define_with_int_value ("_FORTIFY_SOURCE", 2);
++#endif
+
/* Misc. */
if (flag_gnu89_inline)
diff --git a/debian/patches/gcc-default-ssp-strong.diff b/debian/patches/gcc-default-ssp-strong.diff
index 2101fa2..06f4d89 100644
--- a/debian/patches/gcc-default-ssp-strong.diff
+++ b/debian/patches/gcc-default-ssp-strong.diff
@@ -4,10 +4,10 @@ Index: b/src/gcc/gcc.c
===================================================================
--- a/src/gcc/gcc.c
+++ b/src/gcc/gcc.c
-@@ -863,7 +863,7 @@ proper position among the other output f
+@@ -872,7 +872,7 @@ proper position among the other output f
#ifndef SSP_DEFAULT_SPEC
- #ifdef TARGET_LIBC_PROVIDES_SSP
+ #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
@@ -17,7 +17,7 @@ Index: b/src/gcc/doc/invoke.texi
===================================================================
--- a/src/gcc/doc/invoke.texi
+++ b/src/gcc/doc/invoke.texi
-@@ -9771,6 +9771,11 @@ branch target registers within any basic
+@@ -9549,6 +9549,11 @@ branch target registers within any basic
Optimize the prologue of variadic argument functions with respect to usage of
those arguments.
@@ -29,7 +29,7 @@ Index: b/src/gcc/doc/invoke.texi
@item -fsection-anchors
@opindex fsection-anchors
Try to reduce the number of symbolic address calculations by using
-@@ -10351,13 +10356,13 @@ value of a shared integer constant. The
+@@ -10151,13 +10156,13 @@ value of a shared integer constant. The
The minimum size of buffers (i.e.@: arrays) that receive stack smashing
protection when @option{-fstack-protection} is used.
@@ -46,7 +46,7 @@ Index: b/src/gcc/doc/invoke.texi
@item max-jump-thread-duplication-stmts
Maximum number of statements allowed in a block that needs to be
duplicated when threading jumps.
-@@ -11276,10 +11281,6 @@ functions with buffers larger than 8 byt
+@@ -11162,10 +11167,6 @@ functions with buffers larger than 8 byt
when a function is entered and then checked when the function exits.
If a guard check fails, an error message is printed and the program exits.
diff --git a/debian/patches/gcc-default-ssp.diff b/debian/patches/gcc-default-ssp.diff
index bea5f07..3786d10 100644
--- a/debian/patches/gcc-default-ssp.diff
+++ b/debian/patches/gcc-default-ssp.diff
@@ -14,12 +14,12 @@ Index: b/src/gcc/gcc.c
===================================================================
--- a/src/gcc/gcc.c
+++ b/src/gcc/gcc.c
-@@ -863,6 +863,14 @@ proper position among the other output f
+@@ -867,6 +867,14 @@ proper position among the other output f
#define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
#endif
+#ifndef SSP_DEFAULT_SPEC
-+#ifdef TARGET_LIBC_PROVIDES_SSP
++#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 ""
@@ -29,7 +29,7 @@ Index: b/src/gcc/gcc.c
#ifndef LINK_SSP_SPEC
#ifdef TARGET_LIBC_PROVIDES_SSP
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1071,6 +1079,7 @@ static const char *cc1_spec = CC1_SPEC;
+@@ -1075,6 +1083,7 @@ static const char *cc1_spec = CC1_SPEC;
static const char *cc1plus_spec = CC1PLUS_SPEC;
static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
static const char *link_ssp_spec = LINK_SSP_SPEC;
@@ -37,7 +37,7 @@ Index: b/src/gcc/gcc.c
static const char *asm_spec = ASM_SPEC;
static const char *asm_final_spec = ASM_FINAL_SPEC;
static const char *link_spec = LINK_SPEC;
-@@ -1127,7 +1136,7 @@ static const char *cpp_options =
+@@ -1131,7 +1140,7 @@ static const char *cpp_options =
"%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
%{f*} %{g*:%{%:debug-level-gt(0):%{g*}\
%{!fno-working-directory:-fworking-directory}}} %{O*}\
@@ -46,7 +46,7 @@ Index: b/src/gcc/gcc.c
/* This contains cpp options which are not passed when the preprocessor
output will be used by another program. */
-@@ -1319,9 +1328,9 @@ static const struct compiler default_com
+@@ -1323,9 +1332,9 @@ static const struct compiler default_com
%{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
%(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
@@ -58,7 +58,7 @@ Index: b/src/gcc/gcc.c
%{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1},
{"-",
"%{!E:%e-E or -x required when input is from standard input}\
-@@ -1346,7 +1355,7 @@ static const struct compiler default_com
+@@ -1350,7 +1359,7 @@ static const struct compiler default_com
%W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0},
{".i", "@cpp-output", 0, 0, 0},
{"@cpp-output",
@@ -67,7 +67,7 @@ Index: b/src/gcc/gcc.c
{".s", "@assembler", 0, 0, 0},
{"@assembler",
"%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
-@@ -1578,6 +1587,7 @@ static struct spec_list static_specs[] =
+@@ -1582,6 +1591,7 @@ static struct spec_list static_specs[] =
INIT_STATIC_SPEC ("cc1plus", &cc1plus_spec),
INIT_STATIC_SPEC ("link_gcc_c_sequence", &link_gcc_c_sequence_spec),
INIT_STATIC_SPEC ("link_ssp", &link_ssp_spec),
@@ -191,7 +191,7 @@ Index: b/src/gcc/doc/invoke.texi
===================================================================
--- a/src/gcc/doc/invoke.texi
+++ b/src/gcc/doc/invoke.texi
-@@ -10152,6 +10152,9 @@ protection when @option{-fstack-protecti
+@@ -10150,6 +10150,9 @@ protection when @option{-fstack-protecti
The minimum size of variables taking part in stack slot sharing when not
optimizing. The default value is 32.
@@ -201,7 +201,7 @@ Index: b/src/gcc/doc/invoke.texi
@item max-jump-thread-duplication-stmts
Maximum number of statements allowed in a block that needs to be
duplicated when threading jumps.
-@@ -11151,6 +11154,10 @@ functions with buffers larger than 8 byt
+@@ -11154,6 +11157,10 @@ functions with buffers larger than 8 byt
when a function is entered and then checked when the function exits.
If a guard check fails, an error message is printed and the program exits.
--
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