2011-02-10 Kai Tietz <kai.tietz@onevision.com>

        * gas/cfi/cfi-x86_64.d: Adjust for x64 PE+.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 12d96c5f72e6d4004e7ceb15bf5d9a7335e6d29e..f9c90afb17bf3dcac63839d329e421bd5a47b497 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-10  Kai Tietz  <kai.tietz@onevision.com>
+
+       * gas/cfi/cfi-x86_64.d: Adjust for x64 PE+.
+
 2011-02-10  Vincent Rivière  <vincent.riviere@freesbee.fr>
 
        * gas/m68k/cpu32.d: Set explicit architecture for objdump.

diff --git a/gas/testsuite/gas/cfi/cfi-x86_64.d b/gas/testsuite/gas/cfi/cfi-x86_64.d
index 7d20d2a518113870b2670c233b749494f78294f5..31fbf763c671f3cbc482fe48e2db457cc073794c 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-x86_64.d
+++ b/gas/testsuite/gas/cfi/cfi-x86_64.d
@@ -8,11 +8,11 @@ Contents of the .eh_frame section:
   Augmentation:          "zR"
   Code alignment factor: 1
   Data alignment factor: -8
-  Return address column: 16
+  Return address column: (16|32)
   Augmentation data:     1b
 
   DW_CFA_def_cfa: r7 \(rsp\) ofs 8
-  DW_CFA_offset: r16 \(rip\) at cfa-8
+  DW_CFA_offset: (r16 \(rip\)|r32 \(xmm15\)) at cfa-8
   DW_CFA_nop
   DW_CFA_nop
 
@@ -56,7 +56,7 @@ Contents of the .eh_frame section:
   Augmentation:          "zR"
   Code alignment factor: 1
   Data alignment factor: -8
-  Return address column: 16
+  Return address column: (16|32)
   Augmentation data:     1b
 
   DW_CFA_def_cfa: r7 \(rsp\) ofs 8
@@ -89,7 +89,7 @@ Contents of the .eh_frame section:
   Augmentation:          "zR"
   Code alignment factor: 1
   Data alignment factor: -8
-  Return address column: 16
+  Return address column: (16|32)
   Augmentation data:     1b
 
   DW_CFA_undefined: r16 \(rip\)