Enable relro by default for AArch64, ARM and SCORE.

ld	* emultempl/aarch64elf.em (before_parse): Initialise the relro
	field in the link_info structure.
	* emultempl/armelf.em (before_parse): Likewise.
	* emultempl/linux.em (before_parse): Likewise.
	* emultempl/scoreelf.em (before_parse): Likewise.

Backported from upstream 576438f.

Signed-off-by: Andrey Drobyshev <a.drobyshev@partner.samsung.com>
Change-Id: I37738901650b0d254316bbbd8938beebd12418d1

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 21305c3..f9ba9c1 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -9,6 +9,14 @@
        * testsuite/ld-x86-64/pr20830.s: Likewise.
 
 
+2016-08-19  Nick Clifton  <nickc@redhat.com>
+
+       * emultempl/aarch64elf.em (before_parse): Initialise the relro
+       field in the link_info structure.
+       * emultempl/armelf.em (before_parse): Likewise.
+       * emultempl/linux.em (before_parse): Likewise.
+       * emultempl/scoreelf.em (before_parse): Likewise.
+
 2016-08-03  Tristan Gingold  <gingold@adacore.com>
 
        * configure: Regenerate.

diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em
index a17553a..9f2c349 100644 (file)
--- a/ld/emultempl/aarch64elf.em
+++ b/ld/emultempl/aarch64elf.em
@@ -43,6 +43,7 @@ gld${EMULATION_NAME}_before_parse (void)
   input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
   config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`;
+  link_info.relro = DEFAULT_LD_Z_RELRO;
 }
 
 static void

diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index 6074824..03e8fe9 100644 (file)
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -52,6 +52,7 @@ gld${EMULATION_NAME}_before_parse (void)
   input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
   config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`;
+  link_info.relro = DEFAULT_LD_Z_RELRO;
 }
 
 static void

diff --git a/ld/emultempl/linux.em b/ld/emultempl/linux.em
index c28e978..64a9130 100644 (file)
--- a/ld/emultempl/linux.em
+++ b/ld/emultempl/linux.em
@@ -50,6 +50,7 @@ gld${EMULATION_NAME}_before_parse (void)
   ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
   input_flags.dynamic = TRUE;
   config.has_shared = TRUE;
+  link_info.relro = DEFAULT_LD_Z_RELRO;
 }
 
 /* Try to open a dynamic archive.  This is where we know that Linux

diff --git a/ld/emultempl/scoreelf.em b/ld/emultempl/scoreelf.em
index 6433365..7df7f5f 100644 (file)
--- a/ld/emultempl/scoreelf.em
+++ b/ld/emultempl/scoreelf.em
@@ -39,6 +39,7 @@ gld${EMULATION_NAME}_before_parse (void)
   input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
   config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`;
+  link_info.relro = DEFAULT_LD_Z_RELRO;
 }
 
 static void