Nick Clifton cb347a
diff -upr ../binutils-2.22.52.0.1.orig/ld/testsuite/config/default.exp ld/testsuite/config/default.exp
Nick Clifton cb347a
--- a/ld/testsuite/config/default.exp	2012-03-06 14:00:31.141957656 +0000
Nick Clifton cb347a
+++ b/ld/testsuite/config/default.exp	2012-03-06 14:09:33.492940503 +0000
Nick Clifton cb347a
@@ -23,7 +23,7 @@
Nick Clifton cb347a
 #
Nick Clifton cb347a
 
Nick Clifton cb347a
 if ![info exists ld] then {
Nick Clifton cb347a
-    set ld [findfile $base_dir/ld-new $base_dir/ld-new [transform ld]]
Nick Clifton cb347a
+    set ld "[findfile $base_dir/ld-new $base_dir/ld-new [transform ld]] -znorelro"
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb347a
 if ![info exists as] then {
Nick Clifton cb347a
@@ -60,7 +60,7 @@ if {![file isdirectory tmpdir/ld]} then
Nick Clifton cb347a
     catch "exec ln -s ld tmpdir/ld/collect-ld" status
Nick Clifton cb347a
     catch "exec ln -s ../../../gas/as-new tmpdir/ld/as" status
Nick Clifton cb347a
 }
Nick Clifton cb347a
-set gcc_B_opt "-B[pwd]/tmpdir/ld/"
Nick Clifton cb347a
+set gcc_B_opt "-B[pwd]/tmpdir/ld/ -Wl,-z,norelro"
Nick Clifton cb347a
 
Nick Clifton cb347a
 # load the linker path
Nick Clifton cb347a
 set ld_L_opt ""
Nick Clifton cb347a
@@ -279,7 +279,7 @@
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb347a
 if ![info exists LD] then {
Nick Clifton cb347a
-    set LD [findfile $base_dir/ld-new ./ld-new [transform ld]]
Nick Clifton cb347a
+    set LD "[findfile $base_dir/ld-new ./ld-new [transform ld]] -znorelro"
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb347a
 if ![info exists LDFLAGS] then {
Nick Clifton 6b2ab9
diff -cpr ../binutils-2.22.52.0.1.orig/ld/testsuite/ld-bootstrap/bootstrap.exp ld/testsuite/ld-bootstrap/bootstrap.exp
Nick Clifton cb347a
--- a/ld/testsuite/ld-bootstrap/bootstrap.exp	2012-03-06 14:00:30.503957676 +0000
Nick Clifton cb347a
+++ b/ld/testsuite/ld-bootstrap/bootstrap.exp	2012-03-06 15:03:33.949837926 +0000
Nick Clifton cb347a
@@ -71,7 +71,13 @@
Nick Clifton cb347a
 
Nick Clifton cb347a
     # This test can only be run if we have the ld build directory,
Nick Clifton cb347a
     # since we need the object files.
Nick Clifton cb347a
-    if {$ld != "$objdir/ld-new"} {
Nick Clifton cb347a
+    set ldexe $ld
Nick Clifton cb347a
+    set ldparm [string first " " $ld]
Nick Clifton cb347a
+    if { $ldparm > 0 } then {
Nick Clifton cb347a
+	set ldparm [expr $ldparm - 1]
Nick Clifton cb347a
+	set ldexe [string range $ld 0 $ldparm]
Nick Clifton cb347a
+    }
Nick Clifton cb347a
+    if {$ldexe != "$objdir/ld-new"} {
Nick Clifton cb347a
 	untested $testname
Nick Clifton cb347a
 	continue
Nick Clifton cb347a
     }
Nick Clifton cb347a
--- a/ld/emultempl/elf32.em	2013-04-24 11:06:47.777176887 +0100
Nick Clifton cb347a
+++ b/ld/emultempl/elf32.em	2013-04-24 11:07:22.405177847 +0100
Nick Clifton cb347a
@@ -105,6 +105,7 @@
Nick Clifton cb347a
   input_flags.dynamic = ${DYNAMIC_LINK-TRUE};
Nick Clifton cb347a
   config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`;
Nick Clifton cb347a
   config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`;
Nick Clifton cb347a
+  link_info.relro = TRUE;
Nick Clifton cb347a
 }
Nick Clifton cb347a
 
Nick Clifton cb347a
 EOF