MIPS64: Adjust cfi* testcases.

The CFI* testcases fail on MIPS64 because the augmentation string does
not match the regexp. This is because MIPS64 doesn't use the default of
4 for DWARF2_FDE_RELOC_SIZE which ends up as "b" in the augmentation
string. MIPS64 uses the address size which is 8 resulting in "c".

Adding c to the regexp fixes a couple of them. Others also need
adjustments in the FDE header lines due to different
sizes/offsets.

gas/ChangeLog:

2016-10-10  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	* testsuite/gas/cfi/cfi-common-1.d: Adjust regexps for mips64.
	* testsuite/gas/cfi/cfi-common-2.d: Likewise.
	* testsuite/gas/cfi/cfi-common-3.d: Likewise.
	* testsuite/gas/cfi/cfi-common-4.d: Likewise.
	* testsuite/gas/cfi/cfi-common-5.d: Likewise.
	* testsuite/gas/cfi/cfi-common-7.d: Likewise.
	* testsuite/gas/cfi/cfi-common-8.d: Likewise.
	* testsuite/gas/cfi/cfi-common-9.d: Likewise.
	* testsuite/gas/cfi/cfi-mips-1.d: Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 37951017dbb86201157b9c6082740387e9ddacfe..4ecacf4275787b001f7b9683b153f67a05f87f86 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,15 @@
+2016-10-10  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+       * testsuite/gas/cfi/cfi-common-1.d: Adjust regexps for mips64.
+       * testsuite/gas/cfi/cfi-common-2.d: Likewise.
+       * testsuite/gas/cfi/cfi-common-3.d: Likewise.
+       * testsuite/gas/cfi/cfi-common-4.d: Likewise.
+       * testsuite/gas/cfi/cfi-common-5.d: Likewise.
+       * testsuite/gas/cfi/cfi-common-7.d: Likewise.
+       * testsuite/gas/cfi/cfi-common-8.d: Likewise.
+       * testsuite/gas/cfi/cfi-common-9.d: Likewise.
+       * testsuite/gas/cfi/cfi-mips-1.d: Likewise.
+
 2016-10-08  Alan Modra  <amodra@gmail.com>
 
        * Makefile.am (EXTRA_as_new_SOURCES): Add config/rl78-parse.y and

diff --git a/gas/testsuite/gas/cfi/cfi-common-1.d b/gas/testsuite/gas/cfi/cfi-common-1.d
index 40000b87662c8f00ff98f6b2ab63e1af0292ffd9..876c5f228672a9e72cdb537db124ed4165cc61c5 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-common-1.d
+++ b/gas/testsuite/gas/cfi/cfi-common-1.d
@@ -9,7 +9,7 @@ Contents of the .eh_frame section:
   Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
-  Augmentation data:     [01]b
+  Augmentation data:     [01][abc]
 
   DW_CFA_nop
   DW_CFA_nop

diff --git a/gas/testsuite/gas/cfi/cfi-common-2.d b/gas/testsuite/gas/cfi/cfi-common-2.d
index 1e7092ccb2867a8193c76df86a8c31301633ab68..41bbb05ea2ab442e320ea6712e22d887854d8825 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-common-2.d
+++ b/gas/testsuite/gas/cfi/cfi-common-2.d
@@ -9,9 +9,9 @@ Contents of the .eh_frame section:
   Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
-  Augmentation data:     [01]b
+  Augmentation data:     [01][abc]
 #...
-00000014 0+00[12][c0] 0+0018 FDE cie=0+0000 pc=.*
+00000014 0+00[12][c08] 0+0018 FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_advance_loc: 4 to .*

diff --git a/gas/testsuite/gas/cfi/cfi-common-3.d b/gas/testsuite/gas/cfi/cfi-common-3.d
index 954556d07d1964c519d32ecf2645c326380d5d0d..7013c2f3e1ddb994a6c70e022ee81c8bf972f364 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-common-3.d
+++ b/gas/testsuite/gas/cfi/cfi-common-3.d
@@ -9,9 +9,9 @@ Contents of the .eh_frame section:
   Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
-  Augmentation data:     [01]b
+  Augmentation data:     [01][abc]
 #...
-00000014 0+0010 0+0018 FDE cie=00000000 pc=.*
+00000014 0+001[08] 0+0018 FDE cie=00000000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_remember_state
   DW_CFA_restore_state

diff --git a/gas/testsuite/gas/cfi/cfi-common-4.d b/gas/testsuite/gas/cfi/cfi-common-4.d
index 24b218b107a2e90cfb00827b2be9990af287de02..a2a4a5c23d7f38c0f1027826395b4fb420e6c699 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-common-4.d
+++ b/gas/testsuite/gas/cfi/cfi-common-4.d
@@ -9,13 +9,13 @@ Contents of the .eh_frame section:
   Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
-  Augmentation data:     [01]b
+  Augmentation data:     [01][abc]
 #...
-00000014 0+0010 0+0018 FDE cie=0+0000 pc=.*
+00000014 0+001[08] 0+0018 FDE cie=0+0000 pc=.*
   DW_CFA_remember_state
   DW_CFA_restore_state
 #...
-00000028 0+001[04] 0+002c FDE cie=0+0000 pc=.*
+000000(28|30) 0+001[04c] 0+00(2c|34) FDE cie=0+0000 pc=.*
   DW_CFA_remember_state
   DW_CFA_restore_state
 #pass

diff --git a/gas/testsuite/gas/cfi/cfi-common-5.d b/gas/testsuite/gas/cfi/cfi-common-5.d
index fa2292fea5fef0e5d0eaa63f893347e02bbd93c6..75f5138215c02f0429d79722f990a168339bdce4 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-common-5.d
+++ b/gas/testsuite/gas/cfi/cfi-common-5.d
@@ -8,15 +8,15 @@ Contents of the .eh_frame section:
   Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
-  Augmentation data:     [01]b
+  Augmentation data:     [01][abc]
 #...
-00000014 0+0014 0+0018 FDE cie=0+0000 pc=.*
+00000014 0+001[4c] 0+0018 FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_remember_state
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_restore_state
 #...
-0000002c 0+001[48] 0+0030 FDE cie=0+0000 pc=.*
+000000(2c|34) 0+00[12][048] 0+00(30|38) FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_advance_loc: 4 to .*

diff --git a/gas/testsuite/gas/cfi/cfi-common-7.d b/gas/testsuite/gas/cfi/cfi-common-7.d
index 3241a9fcca673b959458a75b719e1a3398599e33..d216ac4cda3f314111866c4cbe60932164f20df0 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-common-7.d
+++ b/gas/testsuite/gas/cfi/cfi-common-7.d
@@ -9,13 +9,13 @@ Contents of the .eh_frame section:
   Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
-  Augmentation data:     [01]b
+  Augmentation data:     [01][abc]
 
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-00000014 0+00(18|1c|20) 0+0018 FDE cie=0+0000 pc=.*
+00000014 0+00(18|1c|20|28) 0+0018 FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 16 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_advance_loc[24]: 75040 to .*

diff --git a/gas/testsuite/gas/cfi/cfi-common-8.d b/gas/testsuite/gas/cfi/cfi-common-8.d
index 61556909e205ed0371529b646ab05aee78c20af1..70047412a86f2c879817fb88c01e7cea6879d527 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-common-8.d
+++ b/gas/testsuite/gas/cfi/cfi-common-8.d
@@ -9,7 +9,7 @@ Contents of the .eh_frame section:
   Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
-  Augmentation data:     [01]b
+  Augmentation data:     [01][abc]
 
   DW_CFA_nop
   DW_CFA_nop

diff --git a/gas/testsuite/gas/cfi/cfi-common-9.d b/gas/testsuite/gas/cfi/cfi-common-9.d
index 33f01762a08ca9246f6c2d4e13710f9fb31ceba7..17f55e4d6eaaa297c8c88f8d5c1422743a0729b7 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-common-9.d
+++ b/gas/testsuite/gas/cfi/cfi-common-9.d
@@ -9,7 +9,7 @@ Contents of the .eh_frame section:
   Code alignment factor: .*
   Data alignment factor: .*
   Return address column: .*
-  Augmentation data:     [01]b
+  Augmentation data:     [01][abc]
 
   DW_CFA_nop
   DW_CFA_nop

diff --git a/gas/testsuite/gas/cfi/cfi-mips-1.d b/gas/testsuite/gas/cfi/cfi-mips-1.d
index 6635b9f18136813e28e77801ae84f013679905bb..3b17aec5c785a23913eb2905523a17ce1d368ea2 100644 (file)
--- a/gas/testsuite/gas/cfi/cfi-mips-1.d
+++ b/gas/testsuite/gas/cfi/cfi-mips-1.d
@@ -8,14 +8,14 @@ Contents of the .eh_frame section:
   Code alignment factor: 1
   Data alignment factor: -4
   Return address column: 31
-  Augmentation data:     0b
+  Augmentation data:     0[bc]
 
   DW_CFA_def_cfa_register: r29
   DW_CFA_def_cfa: r29 ofs 0
   DW_CFA_nop
   DW_CFA_nop
 
-0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+0000..0+002c
+0+0018 0+00(1c|24) 0+001c FDE cie=0+0000 pc=0+0000..0+002c
   DW_CFA_advance_loc: 4 to 0+0004
   DW_CFA_def_cfa_offset: 8
   DW_CFA_advance_loc: 4 to 0+0008