From 96bf8cb07d2cc8d6f7b509c4430be9966fff1fdd Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Thu, 21 Apr 2016 11:05:41 +0930
Subject: New NOCROSSREFS_TO tests

Fixes failures on hppa-linux and alpha-linux due to not merging
.data.* and .sdata into .data.  cross3.t modified too since it is the
template for the NOCROSSREFS_TO scripts.

	* 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.
---
 ld/ChangeLog                     | 9 +++++++++
 ld/testsuite/ld-scripts/cross3.t | 4 ++--
 ld/testsuite/ld-scripts/cross4.t | 4 ++--
 ld/testsuite/ld-scripts/cross5.t | 4 ++--
 ld/testsuite/ld-scripts/cross6.t | 4 ++--
 ld/testsuite/ld-scripts/cross7.t | 4 ++--
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 07209d56d67..0721142d475 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 5e32bb2fca6..e48b9479fd1 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 7f91b817efa..4e5d28a3656 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 43657f17b4e..a581b92d3bb 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 466422171ab..0f23ca062ea 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 dad21031edb..29173fcbf9e 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/ : { *(*) }
 }
-- 
cgit v1.2.1