2003-05-03 H.J. Lu <hjl@gnu.org>

	* gas/elf/elf.exp (run_list_test): Support pipe for readelf.

	* gas/elf/type.e-m32r: Removed.
	* gas/elf/type.e-mips: Likewise.
	* gas/elf/type.e-miwmmxt: Likewise.

	* gas/elf/type.e: Updated.

6 files changed, 18 insertions, 52 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 0822e43..d4436f4 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,15 @@
 2003-05-03  H.J. Lu <hjl@gnu.org>
 
+	* gas/elf/elf.exp (run_list_test): Support pipe for readelf.
+
+	* gas/elf/type.e-m32r: Removed.
+	* gas/elf/type.e-mips: Likewise.
+	* gas/elf/type.e-miwmmxt: Likewise.
+
+	* gas/elf/type.e: Updated.
+
+2003-05-03  H.J. Lu <hjl@gnu.org>
+
 	* gas/ia64/ia64.exp: Add unwind.
 
 	* gas/ia64/unwind.s: New. Test the new section attribute 'o'
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index 27adc36..f9777a1 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -2,7 +2,7 @@
 # elf tests
 #
 
-proc run_list_test { name suffix opts } {
+proc run_list_test { name suffix opts readelf_pipe } {
     global READELF
     global srcdir subdir
     set testname "elf $name list"
@@ -15,7 +15,7 @@ proc run_list_test { name suffix opts } {
 	return
     }
     send_log "$READELF -s dump.o > dump.out\n"
-    catch "exec $READELF -s dump.o > dump.out\n" comp_output
+    catch "exec $READELF -s dump.o $readelf_pipe > dump.out\n" comp_output
     if ![string match "" $comp_output] then {
 	send_log "$comp_output\n"
 	fail $testname
@@ -53,7 +53,7 @@ if { ([istarget "*-*-elf*"]
     run_dump_test "ehopt0"
     run_dump_test "section0" 
     run_dump_test "section1" 
-    run_list_test "section2" "$target_machine" "-al"
+    run_list_test "section2" "$target_machine" "-al" ""
     run_dump_test "symver" 
-    run_list_test "type" "$target_machine" ""
+    run_list_test "type" "" "" "| grep \"1 \\\[FONT\\\]\""
 }
diff --git a/gas/testsuite/gas/elf/type.e b/gas/testsuite/gas/elf/type.e
index ad96001..97742e8 100644
--- a/gas/testsuite/gas/elf/type.e
+++ b/gas/testsuite/gas/elf/type.e
@@ -1,11 +1,4 @@
-
-Symbol table '.symtab' contains 8 entries:
-   Num:    Value[ 	]* Size Type    Bind   Vis      Ndx Name
-     0: 0+0     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+0     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+0     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+0     0 SECTION LOCAL  DEFAULT    3 
-     4: 0+0     1 FUNC    LOCAL  DEFAULT    . function
-     5: 0+0     1 OBJECT  LOCAL  DEFAULT    . object
-     6: 0+1     1 TLS     LOCAL  DEFAULT    . tls_object
-     7: 0+2     1 NOTYPE  LOCAL  DEFAULT    . notype
+     .: 0+0     1 FUNC    LOCAL  DEFAULT    . function
+     .: 0+0     1 OBJECT  LOCAL  DEFAULT    . object
+     .: 0+1     1 TLS     LOCAL  DEFAULT    . tls_object
+     .: 0+2     1 NOTYPE  LOCAL  DEFAULT    . notype
diff --git a/gas/testsuite/gas/elf/type.e-m32r b/gas/testsuite/gas/elf/type.e-m32r
deleted file mode 100644
index 2835a20..0000000
--- a/gas/testsuite/gas/elf/type.e-m32r
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Symbol table '.symtab' contains 9 entries:
-   Num:    Value[ 	]* Size Type    Bind   Vis      Ndx Name
-     0: 0+0     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+0     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+0     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+0     0 SECTION LOCAL  DEFAULT    3 
-     4: 0+0     1 FUNC    LOCAL  DEFAULT    . function
-     5: 0+0     1 OBJECT  LOCAL  DEFAULT    . object
-     6: 0+1     1 TLS     LOCAL  DEFAULT    . tls_object
-     7: 0+2     1 NOTYPE  LOCAL  DEFAULT    . notype
-     8: 0+0     0 SECTION LOCAL  DEFAULT    . 
diff --git a/gas/testsuite/gas/elf/type.e-mips b/gas/testsuite/gas/elf/type.e-mips
deleted file mode 100644
index 7c915da..0000000
--- a/gas/testsuite/gas/elf/type.e-mips
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Symbol table '.symtab' contains 10 entries:
-   Num:    Value[ 	]* Size Type    Bind   Vis      Ndx Name
-     0: 0+0     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+0     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+0     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+0     0 SECTION LOCAL  DEFAULT    3 
-     4: 0+0     1 FUNC    LOCAL  DEFAULT    . function
-     5: 0+0     1 OBJECT  LOCAL  DEFAULT    . object
-     6: 0+1     1 TLS     LOCAL  DEFAULT    . tls_object
-     7: 0+2     1 NOTYPE  LOCAL  DEFAULT    . notype
-     8: 0+0     0 SECTION LOCAL  DEFAULT    . 
-     9: 0+0     0 SECTION LOCAL  DEFAULT    . 
diff --git a/gas/testsuite/gas/elf/type.e-miwmmxt b/gas/testsuite/gas/elf/type.e-miwmmxt
deleted file mode 100644
index 2835a20..0000000
--- a/gas/testsuite/gas/elf/type.e-miwmmxt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Symbol table '.symtab' contains 9 entries:
-   Num:    Value[ 	]* Size Type    Bind   Vis      Ndx Name
-     0: 0+0     0 NOTYPE  LOCAL  DEFAULT  UND 
-     1: 0+0     0 SECTION LOCAL  DEFAULT    1 
-     2: 0+0     0 SECTION LOCAL  DEFAULT    2 
-     3: 0+0     0 SECTION LOCAL  DEFAULT    3 
-     4: 0+0     1 FUNC    LOCAL  DEFAULT    . function
-     5: 0+0     1 OBJECT  LOCAL  DEFAULT    . object
-     6: 0+1     1 TLS     LOCAL  DEFAULT    . tls_object
-     7: 0+2     1 NOTYPE  LOCAL  DEFAULT    . notype
-     8: 0+0     0 SECTION LOCAL  DEFAULT    .