diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 6ca3083d22d..c92d1e4538b 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2015-09-07  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* ld-elf/orphan-7.map: Allow for other discarded sections.
+	* ld-elf/orphan-8.map: Updated to allow for different section
+	ordering on different targets.
+	* ld-elf/orphan.ld: Place .sbss section.
+
 2015-09-05  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ld-elf/orphan-8.map: Updated to support 32-bit targets.
diff --git a/ld/testsuite/ld-elf/orphan-7.map b/ld/testsuite/ld-elf/orphan-7.map
index 52cc359d34a..888cb806519 100644
--- a/ld/testsuite/ld-elf/orphan-7.map
+++ b/ld/testsuite/ld-elf/orphan-7.map
@@ -1,7 +1,8 @@
-
+#...
 Discarded input sections
-
+#...
  \.notbad        0x0+        0x4 tmpdir/.*\.o
  \.note\.bar      0x0+        0x4 tmpdir/.*\.o
-
 #...
+Linker script and memory map
+#...
\ No newline at end of file
diff --git a/ld/testsuite/ld-elf/orphan-8.map b/ld/testsuite/ld-elf/orphan-8.map
index 0bd97666b8b..308d4277c20 100644
--- a/ld/testsuite/ld-elf/orphan-8.map
+++ b/ld/testsuite/ld-elf/orphan-8.map
@@ -1,7 +1,7 @@
 #...
-.notbad         0x0+4        0x4
- .notbad        0x0+4        0x4 tmpdir/dump0.o
+.notbad         0x[0-9a-f]+        0x4
+ .notbad        0x[0-9a-f]+        0x4 tmpdir/dump0.o
 #...
-.note.bar       0x0+10        0x4
- .note.bar      0x0+10        0x4 tmpdir/dump0.o
+.note.bar       0x[0-9a-f]+        0x4
+ .note.bar      0x[0-9a-f]+        0x4 tmpdir/dump0.o
 #...
diff --git a/ld/testsuite/ld-elf/orphan.ld b/ld/testsuite/ld-elf/orphan.ld
index 44eb7eb254e..1ae908b1268 100644
--- a/ld/testsuite/ld-elf/orphan.ld
+++ b/ld/testsuite/ld-elf/orphan.ld
@@ -3,6 +3,7 @@ SECTIONS
   .text : { *(.text) }
   .data : { *(.data) }
   .bss : { *(.bss) *(COMMON) }
+  .sbss : { *(.sbss) }
   .note : { *(.note) }
   /DISCARD/ : { *(.reginfo) *(.MIPS.abiflags) *(.trampolines) }
 }