diff --git a/ld/ChangeLog b/ld/ChangeLog
index 07209d56d6..0721142d47 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2016-04-21  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/ld-scripts/cross3.t: Add commonly used data
+	and text section names to output section statements.
+	* testsuite/ld-scripts/cross4.t: Likewise.
+	* testsuite/ld-scripts/cross5.t: Likewise.
+	* testsuite/ld-scripts/cross6.t: Likewise.
+	* testsuite/ld-scripts/cross7.t: Likewise.
+
 2016-04-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* ldlang.c (lang_check_relocs): New function.
diff --git a/ld/testsuite/ld-scripts/cross3.t b/ld/testsuite/ld-scripts/cross3.t
index 5e32bb2fca..e48b9479fd 100644
--- a/ld/testsuite/ld-scripts/cross3.t
+++ b/ld/testsuite/ld-scripts/cross3.t
@@ -2,9 +2,9 @@ NOCROSSREFS(.nocrossrefs .text)
 
 SECTIONS
 {
-  .text : { *(.text) }
+  .text : { *(.text) *(.text.*) }
   .nocrossrefs : { *(.nocrossrefs) }
-  .data : { *(.data) *(.opd) }
+  .data : { *(.data) *(.data.*) *(.sdata) *(.opd) }
   .bss : { *(.bss) *(COMMON) }
   /DISCARD/ : { *(*) }
 }
diff --git a/ld/testsuite/ld-scripts/cross4.t b/ld/testsuite/ld-scripts/cross4.t
index 7f91b817ef..4e5d28a365 100644
--- a/ld/testsuite/ld-scripts/cross4.t
+++ b/ld/testsuite/ld-scripts/cross4.t
@@ -2,9 +2,9 @@ NOCROSSREFS_TO(.data .nocrossrefs)
 
 SECTIONS
 {
-  .text : { *(.text) }
+  .text : { *(.text) *(.text.*) }
   .nocrossrefs : { *(.nocrossrefs) }
-  .data : { *(.data) *(.opd) }
+  .data : { *(.data) *(.data.*) *(.sdata) *(.opd) }
   .bss : { *(.bss) *(COMMON) }
   /DISCARD/ : { *(*) }
 }
diff --git a/ld/testsuite/ld-scripts/cross5.t b/ld/testsuite/ld-scripts/cross5.t
index 43657f17b4..a581b92d3b 100644
--- a/ld/testsuite/ld-scripts/cross5.t
+++ b/ld/testsuite/ld-scripts/cross5.t
@@ -2,9 +2,9 @@ NOCROSSREFS_TO(.nocrossrefs .data)
 
 SECTIONS
 {
-  .text : { *(.text) }
+  .text : { *(.text) *(.text.*) }
   .nocrossrefs : { *(.nocrossrefs) }
-  .data : { *(.data) *(.opd) }
+  .data : { *(.data) *(.data.*) *(.sdata) *(.opd) }
   .bss : { *(.bss) *(COMMON) }
   /DISCARD/ : { *(*) }
 }
diff --git a/ld/testsuite/ld-scripts/cross6.t b/ld/testsuite/ld-scripts/cross6.t
index 466422171a..0f23ca062e 100644
--- a/ld/testsuite/ld-scripts/cross6.t
+++ b/ld/testsuite/ld-scripts/cross6.t
@@ -2,8 +2,8 @@ NOCROSSREFS_TO(.text .data)
 
 SECTIONS
 {
-  .text : { *(.text) }
-  .data : { *(.data) *(.opd) }
+  .text : { *(.text) *(.text.*) }
+  .data : { *(.data) *(.data.*) *(.sdata) *(.opd) }
   .bss : { *(.bss) *(COMMON) }
   /DISCARD/ : { *(*) }
 }
diff --git a/ld/testsuite/ld-scripts/cross7.t b/ld/testsuite/ld-scripts/cross7.t
index dad21031ed..29173fcbf9 100644
--- a/ld/testsuite/ld-scripts/cross7.t
+++ b/ld/testsuite/ld-scripts/cross7.t
@@ -2,8 +2,8 @@ NOCROSSREFS_TO(.data .text)
 
 SECTIONS
 {
-  .text : { *(.text) }
-  .data : { *(.data) *(.opd) }
+  .text : { *(.text) *(.text.*) }
+  .data : { *(.data) *(.data.*) *(.sdata) *(.opd) }
   .bss : { *(.bss) *(COMMON) }
   /DISCARD/ : { *(*) }
 }