[gcc-7] 125/354: - don't pass -z relro for nvptx-none

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit cd4619abb6c1e8b983ffa3e16c0a63545ab91464
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Mar 2 08:24:11 2017 +0000

     - don't pass -z relro for nvptx-none
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9326 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/gcc-default-relro.diff | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/debian/patches/gcc-default-relro.diff b/debian/patches/gcc-default-relro.diff
index 40855f8..71740c2 100644
--- a/debian/patches/gcc-default-relro.diff
+++ b/debian/patches/gcc-default-relro.diff
@@ -9,7 +9,7 @@ Index: b/src/gcc/doc/invoke.texi
 ===================================================================
 --- a/src/gcc/doc/invoke.texi
 +++ b/src/gcc/doc/invoke.texi
-@@ -11638,6 +11638,9 @@ For example, @option{-Wl,-Map,output.map
+@@ -11813,6 +11813,9 @@ For example, @option{-Wl,-Map,output.map
  linker.  When using the GNU linker, you can also get the same effect with
  @option{-Wl,-Map=output.map}.
  
@@ -23,11 +23,23 @@ Index: b/src/gcc/gcc.c
 ===================================================================
 --- a/src/gcc/gcc.c
 +++ b/src/gcc/gcc.c
-@@ -1027,6 +1027,7 @@ proper position among the other output f
+@@ -1037,6 +1037,11 @@ proper position among the other output f
+ /* We pass any -flto flags on to the linker, which is expected
+    to understand them.  In practice, this means it had better be collect2.  */
+ /* %{e*} includes -export-dynamic; see comment in common.opt.  */
++#if defined(__nvptx__)
++# define RELRO_SPEC ""
++#else
++# define RELRO_SPEC "-z relro "
++#endif
+ #ifndef LINK_COMMAND_SPEC
+ #define LINK_COMMAND_SPEC "\
+ %{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:\
+@@ -1045,6 +1050,7 @@ proper position among the other output f
     "%{flto|flto=*:%<fcompare-debug*} \
      %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
     "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
-+   "-z relro " \
++   RELRO_SPEC \
     "%X %{o*} %{e*} %{N} %{n} %{r}\
      %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} \
      %{static:} %{L*} %(mfwrap) %(link_libgcc) " \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git