* gas/cfi/cfi-i386.d: Use objdump -Wf instead of readelf.

        * gas/cfi/cfi-i386.s: Remove .type directives.
        * gas/cfi/reloc-pe-i386.d: Adjust test for i386.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 6e719405e89afea39f4739b5486daa154808a038..634f9e4d08f5a8b8a9c042054240c3af80c2475b 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-03  Kai Tietz  <kai.tietz@onevision.com>
+
+       * gas/cfi/cfi-i386.d: Use objdump -Wf instead of readelf.
+       * gas/cfi/cfi-i386.s: Remove .type directives.
+       * gas/cfi/reloc-pe-i386.d: Adjust test for i386.
+
 2010-09-02  Richard Henderson  <rth@redhat.com>
 
        * gas/cfi/cfi-common-1.d: Use objdump instead of readelf to dump.

diff --git a/gas/testsuite/gas/cfi/cfi-i386.d b/gas/testsuite/gas/cfi/cfi-i386.d
index 77918ba44cec355c856e920dbea5c23f0a53e8e9..720895947493c6defe6d4d39687c46e055f0ca46 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-i386.d
+++ b/gas/testsuite/gas/cfi/cfi-i386.d
@@ -1,5 +1,6 @@
-#readelf: -wf
+#objdump: -Wf
 #name: CFI on i386
+#...
 Contents of the .eh_frame section:
 
 00000000 00000014 00000000 CIE

diff --git a/gas/testsuite/gas/cfi/cfi-i386.s b/gas/testsuite/gas/cfi/cfi-i386.s
index 9da0db122db92a59415f62aa42cbeaa78337c5c9..88ea56ab93f4dd62c902d15a973e0fb8151728c0 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-i386.s
+++ b/gas/testsuite/gas/cfi/cfi-i386.s
@@ -4,7 +4,6 @@
 #; - function with a space on the stack 
 #;   allocated for local variables
 
-       .type   func_locvars,@function
 func_locvars:
        .cfi_startproc
        
@@ -25,7 +24,6 @@ func_locvars:
 #; - functions that begins with standard
 #;   prologue: "pushq %rbp; movq %rsp,%rbp"
 
-       .type   func_prologue,@function
 func_prologue:
        .cfi_startproc
        
@@ -53,7 +51,6 @@ func_prologue:
 #;   another register (ebx) and then allocates 
 #;   a space for local variables
 
-       .type   func_otherreg,@function
 func_otherreg:
        .cfi_startproc
 
@@ -78,7 +75,6 @@ func_otherreg:
 
 #; main
 #; - typical function
-       .type   main,@function
 main:
        .cfi_startproc
        
@@ -93,7 +89,6 @@ main:
 #; _start
 #; - standard entry point
 
-       .type   _start,@function
        .globl  _start
 _start:
        .cfi_startproc
@@ -108,7 +103,6 @@ _start:
 #; - test for all .cfi register numbers. 
 #;   This function is never called and the CFI info doesn't make sense.
 
-       .type   func_all_registers,@function
 func_all_registers:
        .cfi_startproc simple
 

diff --git a/gas/testsuite/gas/cfi/reloc-pe-i386.d b/gas/testsuite/gas/cfi/reloc-pe-i386.d
index 49703192b1fab97b2bca12e39b4916818c0680ca..506246cd14e2ceb05407225a90bfb57873e56881 100644 (file)
--- a/gas/testsuite/gas/cfi/reloc-pe-i386.d
+++ b/gas/testsuite/gas/cfi/reloc-pe-i386.d
@@ -2,8 +2,8 @@
 #name: reloc-pe-i386
 #...
 RELOCATION RECORDS FOR \[.debug_frame\]:
-OFFSET           TYPE              VALUE 
-000000000000001c secrel32          .debug_frame
-0000000000000020 .* .text
+OFFSET .* TYPE .* VALUE 
+0.* secrel32 .* .debug_frame
+0.* .* .text