Merge from mainline:

	2004-04-19  Jakub Jelinek  <jakub@redhat.com>
	* gas/cfi/cfi-sparc64-1.d: Update.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 7dd1000de78e290d96b05ffc69f815c3569f6ef1..cf95d700f3b10a6ccfa2f26c1c9293b1deb86036 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,4 +1,11 @@
+2004-09-07  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       Merge from mainline:
+       2004-04-19  Jakub Jelinek  <jakub@redhat.com>
+       * gas/cfi/cfi-sparc64-1.d: Update.
+
 2004-08-18  Thiemo Seufer  <seufer@csv.ica.uni-stuttgart.de>
+
        * gas/mips/branch-swap.s: New testcase.
        * gas/mips/branch-swap.d: New testcase.
        * gas/mips/mips.exp: Run the testcase.

diff --git a/gas/testsuite/gas/cfi/cfi-sparc64-1.d b/gas/testsuite/gas/cfi/cfi-sparc64-1.d
index ffe62392b1deff60a5d96ba7ca5934286cf63b15..10d3ea9a4f52719fa691a72e78c0ad485a5491b3 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-sparc64-1.d
+++ b/gas/testsuite/gas/cfi/cfi-sparc64-1.d
@@ -4,7 +4,7 @@
 
 The section .eh_frame contains:
 
-00000000 00000011 00000000 CIE
+00000000 00000014 00000000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 4
@@ -13,13 +13,13 @@ The section .eh_frame contains:
   Augmentation data:     1b
 
   DW_CFA_def_cfa: r14 ofs 2047
+  DW_CFA_nop
+  DW_CFA_nop
+  DW_CFA_nop
 
-00000015 00000017 00000019 FDE cie=00000000 pc=0000001d..0000004d
-  DW_CFA_advance_loc: 4 to 00000021
+00000018 00000014 0000001c FDE cie=00000000 pc=00000020..00000050
+  DW_CFA_advance_loc: 4 to 00000024
   DW_CFA_def_cfa_reg: r30
   DW_CFA_GNU_window_save
   DW_CFA_register: r15 in r31
-  DW_CFA_nop
-  DW_CFA_nop
-  DW_CFA_nop