PR ld/14170

	* ld-elf/pr14170a.s: Put foo, bar address in .data.
	* ld-elf/elf.exp: Don't run pr14170 test on hppa64-hpux.  Ignore
	tic6x warnings.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 2a2bea2..086123b 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-28  Alan Modra  <amodra@gmail.com>
+
+       PR ld/14170
+       * ld-elf/pr14170a.s: Put foo, bar address in .data.
+       * ld-elf/elf.exp: Don't run pr14170 test on hppa64-hpux.  Ignore
+       tic6x warnings.
+
 2012-05-27  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/14170
@@ -5,7 +12,7 @@
 
        * ld-elf/pr14170a.s: New file.
        * ld-elf/pr14170b.s: Likewise.
-       * ld-elf/pr14170b.s: Likewise.
+       * ld-elf/pr14170c.s: Likewise.
 
 2012-05-26  Alan Modra  <amodra@gmail.com>
 

diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp
index f14498f..9964ccd 100644 (file)
--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -57,6 +57,20 @@ if { ![istarget hppa64*-hpux*] } {
            "" ""
            {symbol3w.s} {} "symbol3w.a"}
     }
+
+    if { [check_shared_lib_support] } then {
+       run_ld_link_tests {
+           {"Build pr14170a.o" "" "" "pr14170a.s" {} "pr14170.a" }
+       }
+       setup_xfail "tic6x-*-*"
+       run_ld_link_tests {
+           {"Build shared library for pr14170"
+               "-shared" "" "pr14170b.s" {} "pr14170.so" }
+           {"PR ld/14170"
+               "tmpdir/pr14170a.o tmpdir/pr14170.so" "" "pr14170c.s"
+               { } "pr14170" }
+       }
+    }
 }
 
 # Run a test to check linking a shared library with a broken linker
@@ -66,23 +80,15 @@ if { ![istarget hppa64*-hpux*] } {
 #
 # Only run the test on targets thats support creating shared libraries.
 if { [check_shared_lib_support] } then {
-  run_ld_link_tests {
-      {"Build pr14170a.o" "" "" "pr14170a.s" {} "pr14170.a" }
-      {"Build shared library for pr14170"
-       "-shared" "" "pr14170b.s" {} "pr14170.so" }
-      {"PR ld/14170"
-        "tmpdir/pr14170a.o tmpdir/pr14170.so" "" "pr14170c.s"
-         { } "a.out" }
-  }
-  setup_xfail "tic6x-*-*"
-  run_ld_link_tests {
-      {"Build shared library for next test"
-       "-shared" "" "note-3.s" {} "note-3.so" }
-      {"Link using broken linker script"
-        "--script note-3.t tmpdir/note-3.so" "" ""
-         { { ld "note-3.l" } }
-         "a.out" }
-  }
+    setup_xfail "tic6x-*-*"
+    run_ld_link_tests {
+       {"Build shared library for next test"
+           "-shared" "" "note-3.s" {} "note-3.so" }
+       {"Link using broken linker script"
+           "--script note-3.t tmpdir/note-3.so" "" ""
+           { { ld "note-3.l" } }
+           "a.out" }
+    }
 }
 
 set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]

diff --git a/ld/testsuite/ld-elf/pr14170a.s b/ld/testsuite/ld-elf/pr14170a.s
index 6c01cae..4264eee 100644 (file)
--- a/ld/testsuite/ld-elf/pr14170a.s
+++ b/ld/testsuite/ld-elf/pr14170a.s
@@ -7,5 +7,7 @@ _start:
 __start:
        .global main    /* Used by HPPA targets.  */
 main:
+
+       .data
        .dc.a foo
        .dc.a bar