2003-09-30 H.J. Lu <hongjiu.lu@intel.com>

	* ld-ia64/ia64.exp: Remove -melf64_ia64.

	* ld-ia64/tlsbin.dd: Remove -melf64_ia64. Match elf..-ia64-.*
	instead of elf64-ia64-little.
	* ld-ia64/tlsbin.rd: Likewise.
	* ld-ia64/tlsbin.sd: Likewise.
	* ld-ia64/tlsbin.td: Likewise.
	* ld-ia64/tlsg.sd: Likewise.
	* ld-ia64/tlspic.dd: Likewise.
	* ld-ia64/tlspic.rd: Likewise.
	* ld-ia64/tlspic.sd: Likewise.
	* ld-ia64/tlspic.td: Likewise.

11 files changed, 35 insertions, 20 deletions

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 643db87..160ee13 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2003-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ld-ia64/ia64.exp: Remove -melf64_ia64.
+
+	* ld-ia64/tlsbin.dd: Remove -melf64_ia64. Match elf..-ia64-.*
+	instead of elf64-ia64-little.
+	* ld-ia64/tlsbin.rd: Likewise.
+	* ld-ia64/tlsbin.sd: Likewise.
+	* ld-ia64/tlsbin.td: Likewise.
+	* ld-ia64/tlsg.sd: Likewise.
+	* ld-ia64/tlspic.dd: Likewise.
+	* ld-ia64/tlspic.rd: Likewise.
+	* ld-ia64/tlspic.sd: Likewise.
+	* ld-ia64/tlspic.td: Likewise.
+
 2003-09-30  Chris Demetriou  <cgd@broadcom.com>
 
 	* ld-mips-elf/mips-elf-flags.exp: Add tests for combinations
diff --git a/ld/testsuite/ld-ia64/ia64.exp b/ld/testsuite/ld-ia64/ia64.exp
index be96171..0af0436 100644
--- a/ld/testsuite/ld-ia64/ia64.exp
+++ b/ld/testsuite/ld-ia64/ia64.exp
@@ -34,19 +34,19 @@ if { !([istarget "ia64-*-elf*"]
 # readelf: Apply readelf options on result.  Compare with regex (last arg).
 
 set ia64tests {
-    {"TLS -fpic -shared" "-shared -melf64_ia64"
+    {"TLS -fpic -shared" "-shared"
      "" {tlspic1.s tlspic2.s}
      {{readelf -WSsrl tlspic.rd} {objdump -drj.text tlspic.dd}
       {objdump -sj.got tlspic.sd} {objdump -sj.tdata tlspic.td}}
       "libtlspic.so"}
-    {"Helper shared library" "-shared -melf64_ia64"
+    {"Helper shared library" "-shared"
      "" {tlslib.s} {} "libtlslib.so"}
     {"TLS -fpic and -fno-pic exec"
-     "-melf64_ia64 tmpdir/libtlslib.so" "" {tlsbinpic.s tlsbin.s}
+     "tmpdir/libtlslib.so" "" {tlsbinpic.s tlsbin.s}
      {{readelf -WSsrl tlsbin.rd} {objdump -drj.text tlsbin.dd}
       {objdump -sj.got tlsbin.sd} {objdump -sj.tdata tlsbin.td}}
       "tlsbin"}
-    {"TLS in debug sections" "-melf64_ia64"
+    {"TLS in debug sections" ""
      "" {tlsg.s}
      {{objdump -sj.debug_foobar tlsg.sd}} "tlsg"}
 }
diff --git a/ld/testsuite/ld-ia64/tlsbin.dd b/ld/testsuite/ld-ia64/tlsbin.dd
index aa395e9..c3177b8 100644
--- a/ld/testsuite/ld-ia64/tlsbin.dd
+++ b/ld/testsuite/ld-ia64/tlsbin.dd
@@ -1,11 +1,11 @@
 #source: tlsbinpic.s
 #source: tlsbin.s
 #as:
-#ld: -shared -melf64_ia64
+#ld: -shared
 #objdump: -drj.text
 #target: ia64-*-*
 
-.*: +file format elf64-ia64-little
+.*: +file format elf..-ia64-.*
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-ia64/tlsbin.rd b/ld/testsuite/ld-ia64/tlsbin.rd
index f93e7d3..466c5b4 100644
--- a/ld/testsuite/ld-ia64/tlsbin.rd
+++ b/ld/testsuite/ld-ia64/tlsbin.rd
@@ -1,7 +1,7 @@
 #source: tlsbinpic.s
 #source: tlsbin.s
 #as:
-#ld: -shared -melf64_ia64
+#ld: -shared
 #readelf: -WSsrl
 #target: ia64-*-*
 
diff --git a/ld/testsuite/ld-ia64/tlsbin.sd b/ld/testsuite/ld-ia64/tlsbin.sd
index f5a8aae..847a20d 100644
--- a/ld/testsuite/ld-ia64/tlsbin.sd
+++ b/ld/testsuite/ld-ia64/tlsbin.sd
@@ -1,11 +1,11 @@
 #source: tlsbinpic.s
 #source: tlsbin.s
 #as:
-#ld: -shared -melf64_ia64
+#ld: -shared
 #objdump: -sj.got
 #target: ia64-*-*
 
-.*: +file format elf64-ia64-little
+.*: +file format elf..-ia64-.*
 
 Contents of section .got:
  (60+)?21b0 0+ 0+ 0+ 0+  .*
diff --git a/ld/testsuite/ld-ia64/tlsbin.td b/ld/testsuite/ld-ia64/tlsbin.td
index b78798a..3d58077 100644
--- a/ld/testsuite/ld-ia64/tlsbin.td
+++ b/ld/testsuite/ld-ia64/tlsbin.td
@@ -1,11 +1,11 @@
 #source: tlsbinpic.s
 #source: tlsbin.s
 #as:
-#ld: -shared -melf64_ia64
+#ld: -shared
 #objdump: -sj.tdata
 #target: ia64-*-*
 
-.*: +file format elf64-ia64-little
+.*: +file format elf..-ia64-.*
 
 Contents of section .tdata:
  (60+)?2000 11000000 12000000 13000000 14000000  .*
diff --git a/ld/testsuite/ld-ia64/tlsg.sd b/ld/testsuite/ld-ia64/tlsg.sd
index c426a99..67bc9cd 100644
--- a/ld/testsuite/ld-ia64/tlsg.sd
+++ b/ld/testsuite/ld-ia64/tlsg.sd
@@ -1,10 +1,10 @@
 #source: tlsg.s
 #as:
-#ld: -melf64_ia64
+#ld:
 #objdump: -sj.debug_foobar
 #target: ia64-*-*
 
-.*: +file format elf64-ia64-little
+.*: +file format elf..-ia64-.*
 
 Contents of section .debug_foobar:
  0+ 18000000 0+  +.*
diff --git a/ld/testsuite/ld-ia64/tlspic.dd b/ld/testsuite/ld-ia64/tlspic.dd
index 1e7db2c..79da6af 100644
--- a/ld/testsuite/ld-ia64/tlspic.dd
+++ b/ld/testsuite/ld-ia64/tlspic.dd
@@ -1,11 +1,11 @@
 #source: tlspic1.s
 #source: tlspic2.s
 #as:
-#ld: -shared -melf64_ia64
+#ld:
 #objdump: -drj.text
 #target: ia64-*-*
 
-.*: +file format elf64-ia64-little
+.*: +file format elf..-ia64-.*
 
 Disassembly of section .text:
 
diff --git a/ld/testsuite/ld-ia64/tlspic.rd b/ld/testsuite/ld-ia64/tlspic.rd
index 87c5de5..1088f8e 100644
--- a/ld/testsuite/ld-ia64/tlspic.rd
+++ b/ld/testsuite/ld-ia64/tlspic.rd
@@ -1,7 +1,7 @@
 #source: tlspic1.s
 #source: tlspic2.s
 #as:
-#ld: -shared -melf64_ia64
+#ld: -shared
 #readelf: -WSsrl
 #target: ia64-*-*
 
diff --git a/ld/testsuite/ld-ia64/tlspic.sd b/ld/testsuite/ld-ia64/tlspic.sd
index 01486fe..41d4951 100644
--- a/ld/testsuite/ld-ia64/tlspic.sd
+++ b/ld/testsuite/ld-ia64/tlspic.sd
@@ -1,11 +1,11 @@
 #source: tlspic1.s
 #source: tlspic2.s
 #as:
-#ld: -shared -melf64_ia64
+#ld: -shared
 #objdump: -sj.got
 #target: ia64-*-*
 
-.*: +file format elf64-ia64-little
+.*: +file format elf..-ia64-.*
 
 Contents of section .got:
  121a0 0+ 0+ 0+ 0+  .*
diff --git a/ld/testsuite/ld-ia64/tlspic.td b/ld/testsuite/ld-ia64/tlspic.td
index 67debe6..16c4a8a 100644
--- a/ld/testsuite/ld-ia64/tlspic.td
+++ b/ld/testsuite/ld-ia64/tlspic.td
@@ -1,11 +1,11 @@
 #source: tlspic1.s
 #source: tlspic2.s
 #as:
-#ld: -shared -melf64_ia64
+#ld: -shared
 #objdump: -sj.tdata
 #target: ia64-*-*
 
-.*: +file format elf64-ia64-little
+.*: +file format elf..-ia64-.*
 
 Contents of section .tdata:
  12000 11000000 12000000 13000000 14000000  .*