* ld-i386/i386.exp (reloc): Turn off combreloc.

	* ld-i386/reloc.d: Likewise.
	* ld-powerpc/powerpc.exp: Likewise.
	* ld-powerpc/reloc.d: Likewise.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index f95d0a8..f559763 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-10  Alan Modra  <amodra@bigpond.net.au>
+
+       * ld-i386/i386.exp (reloc): Turn off combreloc.
+       * ld-i386/reloc.d: Likewise.
+       * ld-powerpc/powerpc.exp: Likewise.
+       * ld-powerpc/reloc.d: Likewise.
+
 2002-10-03  H.J. Lu <hjl@gnu.org>
 
        * ld-elfvers/vers21.c (_old_foobar): Initialized to -1 for gcc

diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 846847e..680ced9 100644 (file)
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -57,8 +57,8 @@ set i386tests {
      {{objdump -sj.debug_foobar tlsg.sd}} "tlsg"}
     {"TLS @indntpoff with %eax" "-melf_i386" "--32" {tlsindntpoff.s}
      {{objdump -drj.text tlsindntpoff.dd}} "tlsindntpoff"}
-    {"Reloc section order" "-shared -melf_i386" "--32" {reloc.s}
-     {{objdump -hw reloc.d}} "reloc.so"}
+    {"Reloc section order" "-shared -melf_i386 -z nocombreloc" "--32"
+     {reloc.s} {{objdump -hw reloc.d}} "reloc.so"}
 }
 
 run_ld_link_tests $i386tests

diff --git a/ld/testsuite/ld-i386/reloc.d b/ld/testsuite/ld-i386/reloc.d
index 2981110..9e8faa4 100644 (file)
--- a/ld/testsuite/ld-i386/reloc.d
+++ b/ld/testsuite/ld-i386/reloc.d
@@ -2,7 +2,7 @@
 # .rel.plt is the only reloc section.
 #source: reloc.s
 #as: --32
-#ld: -shared -melf_i386
+#ld: -shared -melf_i386 -z nocombreloc
 #objdump: -hw
 #target: i?86-*-*
 

diff --git a/ld/testsuite/ld-powerpc/powerpc.exp b/ld/testsuite/ld-powerpc/powerpc.exp
index cd8b25d..f52278d 100644 (file)
--- a/ld/testsuite/ld-powerpc/powerpc.exp
+++ b/ld/testsuite/ld-powerpc/powerpc.exp
@@ -39,7 +39,7 @@ if { [istarget "*-*-macos*"] || [istarget "*-*-netware*"]
 # readelf: Apply readelf options on result.  Compare with regex (last arg).
 
 set ppcelftests {
-    {"Reloc section order" "-shared" "" {reloc.s}
+    {"Reloc section order" "-shared -z nocombreloc" "" {reloc.s}
      {{objdump -hw reloc.d}} "reloc.so"}
 }
 

diff --git a/ld/testsuite/ld-powerpc/reloc.d b/ld/testsuite/ld-powerpc/reloc.d
index 80a22bf..08a209d 100644 (file)
--- a/ld/testsuite/ld-powerpc/reloc.d
+++ b/ld/testsuite/ld-powerpc/reloc.d
@@ -3,7 +3,7 @@
 # reloc sections go after alloc sections.
 
 #source: reloc.s
-#ld: -shared
+#ld: -shared -z nocombreloc
 #objdump: -hw
 
 .*: +file format elf.*