* gas/cfi/cfi-common-1.d: Allow for differing offsets, and

        for DW_CFA_offset_extended_sf results.  Allow for differing nops.
        * gas/cfi/cfi-hppa-1.d: Invert data alignment sign.  Change
        offsets to match 64-bit offsets.
        * gas/cfi/cfi.exp: Don't run common tests on hppa64.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 112ff491f7ff0a69272e28e5ec6ce36f65bbdc47..03f64458f0229926d6d69d034dd91ba46c584f3a 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-21  Richard Henderson  <rth@redhat.com>
+
+       * gas/cfi/cfi-common-1.d: Allow for differing offsets, and
+       for DW_CFA_offset_extended_sf results.  Allow for differing nops.
+       * gas/cfi/cfi-hppa-1.d: Invert data alignment sign.  Change 
+       offsets to match 64-bit offsets.
+       * gas/cfi/cfi.exp: Don't run common tests on hppa64.
+
 2008-08-20  Bob Wilson  <bob.wilson@acm.org>
 
        * gas/all/gas.exp: Expect the redef test to fail on Xtensa.

diff --git a/gas/testsuite/gas/cfi/cfi-common-1.d b/gas/testsuite/gas/cfi/cfi-common-1.d
index 1a5ee08ec874acfc77f553cbe7b89da8d9433121..32eaf4b2aa95dce02b17b158ffa0137ba34668d1 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-common-1.d
+++ b/gas/testsuite/gas/cfi/cfi-common-1.d
@@ -14,10 +14,11 @@ The section .eh_frame contains:
   DW_CFA_nop
   DW_CFA_nop
 
-00000014 00000018 00000018 FDE cie=00000000 pc=.*
+00000014 000000(18|1c|20) 00000018 FDE cie=00000000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
-  DW_CFA_offset: r1( \((rdx|ecx)\)|) at cfa-8
+  DW_CFA_offset(_extended_sf|): r1( \((rdx|ecx)\)|) at cfa-8
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa_offset: 32
-  DW_CFA_offset: r2( \((rcx|edx)\)|) at cfa-24
+  DW_CFA_offset(_extended_sf|): r2( \((rcx|edx)\)|) at cfa-24
+#...

diff --git a/gas/testsuite/gas/cfi/cfi-hppa-1.d b/gas/testsuite/gas/cfi/cfi-hppa-1.d
index 29a72ad17931c0330c223c8216ce56cd3508163a..be8bf39b4e1a9deb62ace5217ef5b4cbbe2d0876 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-hppa-1.d
+++ b/gas/testsuite/gas/cfi/cfi-hppa-1.d
@@ -6,13 +6,13 @@ The section .eh_frame contains:
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 4
-  Data alignment factor: -[48]
+  Data alignment factor: [48]
   Return address column: 2
-  Augmentation data:     1b
+  Augmentation data:     1[bc]
 
   DW_CFA_def_cfa: r30 ofs 0
 
-00000014 00000018 00000018 FDE cie=00000000 pc=00000000..00000018
+00000014 000000(18|20) 00000018 FDE cie=00000000 pc=00000000..00000018
   DW_CFA_advance_loc: 8 to 00000008
   DW_CFA_def_cfa_register: r3
   DW_CFA_advance_loc: 4 to 0000000c
@@ -21,17 +21,16 @@ The section .eh_frame contains:
   DW_CFA_def_cfa_register: r30
   DW_CFA_nop
 
-00000030 00000018 00000034 FDE cie=00000000 pc=00000018..00000040
+0000003[08] 000000(18|20) 0000003[4c] FDE cie=00000000 pc=00000018..00000040
   DW_CFA_advance_loc: 12 to 00000024
   DW_CFA_def_cfa_register: r3
-  DW_CFA_offset: r2 at cfa-24
+  DW_CFA_offset_extended_sf: r2 at cfa-24
   DW_CFA_advance_loc: 24 to 0000003c
   DW_CFA_def_cfa_register: r30
   DW_CFA_nop
   DW_CFA_nop
-  DW_CFA_nop
 
-0000004c 00000010 00000050 FDE cie=00000000 pc=00000040..00000048
+000000[45]c 0000001[08] 000000[56]0 FDE cie=00000000 pc=00000040..00000048
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop

diff --git a/gas/testsuite/gas/cfi/cfi.exp b/gas/testsuite/gas/cfi/cfi.exp
index 68290da9a7ed23a4c49f34a9464710bac809f83c..cd36f7fc0a26e35b38fa7e977f5ec24bd0549a6d 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi.exp
+++ b/gas/testsuite/gas/cfi/cfi.exp
@@ -80,13 +80,18 @@ if  { [istarget "i*86-*-*"] || [istarget "x86_64-*-*"] } then {
 }
 
 run_list_test "cfi-diag-1" ""
-run_dump_test "cfi-common-1"
-run_dump_test "cfi-common-2"
-run_dump_test "cfi-common-3"
-run_dump_test "cfi-common-4"
-run_dump_test "cfi-common-5"
 
-# MIPS doesn't support PC relative cfi directives
+# HPPA64 uses 64-bit relocations, which results in all of the dump
+# offset numbers not matching up.
+if { ![istarget "hppa64*-*"] } then {
+  run_dump_test "cfi-common-1"
+  run_dump_test "cfi-common-2"
+  run_dump_test "cfi-common-3"
+  run_dump_test "cfi-common-4"
+  run_dump_test "cfi-common-5"
+}
+
+# MIPS doesn't support PC relative cfi directives.
 if { ![istarget "mips*-*"] } then {
     run_dump_test "cfi-common-6"
 }