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.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 643db87fcd5e9ac89dc10796af0422bf62d908e7..160ee1397dd816191811f3d1ff68aecbc7da06f8 100644 (file)
--- 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 be96171fe2c2317a72426a5e9f933264a54e6411..0af0436927417824674bc020051425997867de5d 100644 (file)
--- 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 aa395e9c9421030d0fa9abb9d3d9a70ec80ac539..c3177b83b19618d4df29349570fa3c28396163ca 100644 (file)
--- 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 f93e7d3c4eab316c14523a4932b86e1712709012..466c5b42826cb7d6eea161fe54b05bc70e5d4e7e 100644 (file)
--- 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 f5a8aaedee52656a7aa684a8718a96b470207d1a..847a20d38d38f91cc2637cc07f1e31a3d517adaf 100644 (file)
--- 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 b78798a24fbb3c0f836c22511c8a783189dde6a8..3d580777745c55b9d6318182539daf0a7a586199 100644 (file)
--- 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 c426a991f7bdea70d90415cb9df0fe9bf9fac1fd..67bc9cdd4ed8228fe5e8cc6851a687a05a60db3d 100644 (file)
--- 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 1e7db2c6564f32da2cabff39f4fe72fbc2a134a6..79da6af07020c23249d2e54a41169e5c742a0e40 100644 (file)
--- 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 87c5de59c1c15f4733b1556b3ecc1e509330d0ee..1088f8efa26d2065d984ab993b4496c0365ca9a1 100644 (file)
--- 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 01486fe19b6860b99f0054b70973ed3791fb7ec0..41d49511accae69b80b5a4f45a814d1b2b303b5e 100644 (file)
--- 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 67debe68797de8a5cf3cd68ae2acde29372d2cca..16c4a8a50edd7236539b00120722ed993a3ec9ce 100644 (file)
--- 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  .*