6 files changed, 16 insertions, 7 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 628c906..d987267 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2014-12-24  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* ld/testsuite/ld-avr/relax-elf-flags-02.d: Add -mno-link-relax
+	option.
+	* ld/testsuite/ld-avr/relax-elf-flags-03.d: Likewise.
+	* ld/testsuite/ld-avr/relax-elf-flags-04.d: Likewise.
+	* ld/testsuite/ld-avr/relax-elf-flags-05.d: Likewise.
+	* ld/testsuite/ld-avr/relax-elf-flags-06.d: Likewise.
+
 2014-12-24  Alan Modra  <amodra@gmail.com>
 
 	* ld-scripts/defined6.s,
diff --git a/ld/testsuite/ld-avr/relax-elf-flags-02.d b/ld/testsuite/ld-avr/relax-elf-flags-02.d
index 6a008bd..c4d7660 100644
--- a/ld/testsuite/ld-avr/relax-elf-flags-02.d
+++ b/ld/testsuite/ld-avr/relax-elf-flags-02.d
@@ -1,7 +1,7 @@
 #name: AVR, check link-relax flag is clear on partial link (first file)
 #as: -mmcu=avrxmega2
 #ld: -r -mavrxmega2
-#source: relax-elf-flags-a.s
+#source: relax-elf-flags-a.s -mno-link-relax
 #source: relax-elf-flags-b.s -mlink-relax
 #readelf: -h
 #target: avr-*-*
diff --git a/ld/testsuite/ld-avr/relax-elf-flags-03.d b/ld/testsuite/ld-avr/relax-elf-flags-03.d
index 3d2a70d..c75c1df 100644
--- a/ld/testsuite/ld-avr/relax-elf-flags-03.d
+++ b/ld/testsuite/ld-avr/relax-elf-flags-03.d
@@ -2,7 +2,7 @@
 #as: -mmcu=avrxmega2
 #ld: -r -mavrxmega2
 #source: relax-elf-flags-a.s -mlink-relax
-#source: relax-elf-flags-b.s
+#source: relax-elf-flags-b.s -mno-link-relax
 #readelf: -h
 #target: avr-*-*
 
diff --git a/ld/testsuite/ld-avr/relax-elf-flags-04.d b/ld/testsuite/ld-avr/relax-elf-flags-04.d
index e2a9bb6..8fa4574 100644
--- a/ld/testsuite/ld-avr/relax-elf-flags-04.d
+++ b/ld/testsuite/ld-avr/relax-elf-flags-04.d
@@ -1,8 +1,8 @@
 #name: AVR, check link-relax flag is clear on partial link (both files)
 #as: -mmcu=avrxmega2
 #ld: -r -mavrxmega2
-#source: relax-elf-flags-a.s
-#source: relax-elf-flags-b.s
+#source: relax-elf-flags-a.s -mno-link-relax
+#source: relax-elf-flags-b.s -mno-link-relax
 #readelf: -h
 #target: avr-*-*
 
diff --git a/ld/testsuite/ld-avr/relax-elf-flags-05.d b/ld/testsuite/ld-avr/relax-elf-flags-05.d
index 8c41e8d..de62bbb 100644
--- a/ld/testsuite/ld-avr/relax-elf-flags-05.d
+++ b/ld/testsuite/ld-avr/relax-elf-flags-05.d
@@ -1,8 +1,8 @@
 #name: AVR, check link-relax flag is set final link (no inputs relaxable)
 #as: -mmcu=avrxmega2
 #ld: -relax -mavrxmega2
-#source: relax-elf-flags-a.s
-#source: relax-elf-flags-b.s
+#source: relax-elf-flags-a.s -mno-link-relax
+#source: relax-elf-flags-b.s -mno-link-relax
 #readelf: -h
 #target: avr-*-*
 
diff --git a/ld/testsuite/ld-avr/relax-elf-flags-06.d b/ld/testsuite/ld-avr/relax-elf-flags-06.d
index 5d8e3c1..5a8e810 100644
--- a/ld/testsuite/ld-avr/relax-elf-flags-06.d
+++ b/ld/testsuite/ld-avr/relax-elf-flags-06.d
@@ -2,7 +2,7 @@
 #as: -mmcu=avrxmega2
 #ld: -relax -mavrxmega2
 #source: relax-elf-flags-a.s -mlink-relax
-#source: relax-elf-flags-b.s
+#source: relax-elf-flags-b.s -mno-link-relax
 #readelf: -h
 #target: avr-*-*