* gas/tic6x/unwind-1.d: Update for readelf changes.

	* gas/tic6x/unwind-2.d: Likewise.
	* gas/tic6x/unwind-3.d: Likewise.

4 files changed, 40 insertions, 34 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b091ae4..7c393b8 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-19  Alan Modra  <amodra@gmail.com>
+
+	* gas/tic6x/unwind-1.d: Update for readelf changes.
+	* gas/tic6x/unwind-2.d: Likewise.
+	* gas/tic6x/unwind-3.d: Likewise.
+
 2012-05-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* gas/all/weakref1.d: Expect addend as signed.
diff --git a/gas/testsuite/gas/tic6x/unwind-1.d b/gas/testsuite/gas/tic6x/unwind-1.d
index 1b240f9..bcfe822 100644
--- a/gas/testsuite/gas/tic6x/unwind-1.d
+++ b/gas/testsuite/gas/tic6x/unwind-1.d
@@ -6,94 +6,94 @@
 Unwind table index '.c6xabi.exidx' .*
 
 0x0: 0x83020227
-  Compact model 3
+  Compact model index: 3
   Stack increment 8
   Registers restored: A11, B3
   Return register: B3
 
 0x100: 0x808003e7
-  Compact model 0
+  Compact model index: 0
   0x80 0x03 pop {A10, A11}
   0xe7      RETURN
 
 0x200: 0x81008863
-  Compact model 1
+  Compact model index: 1
   0x88 0x63 pop {A10, A11, B3, B10, B15}
 
 0x300: 0x83020227
-  Compact model 3
+  Compact model index: 3
   Stack increment 8
   Registers restored: A11, B3
   Return register: B3
 
 0x400: 0x84000227
-  Compact model 4
+  Compact model index: 4
   Stack increment 0
   Registers restored:  \(compact\) A11, B3
   Return register: B3
 
 0x500: 0x80a022e7
-  Compact model 0
+  Compact model index: 0
   0xa0 0x22 pop compact {A11, B3}
   0xe7      RETURN
 
 0x600: 0x84000227
-  Compact model 4
+  Compact model index: 4
   Stack increment 0
   Registers restored:  \(compact\) A11, B3
   Return register: B3
 
 0x700: 0x84000637
-  Compact model 4
+  Compact model index: 4
   Stack increment 0
   Registers restored:  \(compact\) A10, A11, B3, B10
   Return register: B3
 
 0x800: 0x840002d7
-  Compact model 4
+  Compact model index: 4
   Stack increment 0
   Registers restored:  \(compact\) A10, A12, A13, B3
   Return register: B3
 
 0x900: 0x84000c07
-  Compact model 4
+  Compact model index: 4
   Stack increment 0
   Registers restored:  \(compact\) B10, B11
   Return register: B3
 
 0xa00: 0x83ff0027
-  Compact model 3
+  Compact model index: 3
   Restore stack from frame pointer
   Registers restored: A11, A15
   Return register: B3
 
 0xb00: 0x84ff0027
-  Compact model 4
+  Compact model index: 4
   Restore stack from frame pointer
   Registers restored:  \(compact\) A11, A15
   Return register: B3
 
 0xc00: 0x8001c1f7
-  Compact model 0
+  Compact model index: 0
   0x01      sp = sp \+ 16
   0xc1 0xf7 pop frame {B3, \[pad\]}
 
 0xd00: @0x.*
-  Compact model 1
+  Compact model index: 1
   0x01      sp = sp \+ 16
   0xc2 0xf7 0xbf pop frame {\[pad\], A11, B3, \[pad\]}
   0xe7      RETURN
   0xe7      RETURN
 
 0xe00: @0x.*
-  Compact model 1
+  Compact model index: 1
   0x01      sp = sp \+ 16
   0xc2 0xf7 0xfb pop frame {A11, \[pad\], B3, \[pad\]}
   0xe7      RETURN
   0xe7      RETURN
 
 0xf00: @0x.*
-  Compact model 1
+  Compact model index: 1
   0x02      sp = sp \+ 24
   0xc2 0x7f 0xff 0xfb pop frame {A11, \[pad\], \[pad\], \[pad\], \[pad\], B3}
   0xe7      RETURN
diff --git a/gas/testsuite/gas/tic6x/unwind-2.d b/gas/testsuite/gas/tic6x/unwind-2.d
index c022ec4..af5f387 100644
--- a/gas/testsuite/gas/tic6x/unwind-2.d
+++ b/gas/testsuite/gas/tic6x/unwind-2.d
@@ -6,94 +6,94 @@
 Unwind table index '.c6xabi.exidx' .*
 
 0x0: 0x83020227
-  Compact model 3
+  Compact model index: 3
   Stack increment 8
   Registers restored: A11, B3
   Return register: B3
 
 0x100: 0x808003e7
-  Compact model 0
+  Compact model index: 0
   0x80 0x03 pop {A10, A11}
   0xe7      RETURN
 
 0x200: 0x81008863
-  Compact model 1
+  Compact model index: 1
   0x88 0x63 pop {A10, A11, B3, B10, B15}
 
 0x300: 0x83020227
-  Compact model 3
+  Compact model index: 3
   Stack increment 8
   Registers restored: A11, B3
   Return register: B3
 
 0x400: 0x84000227
-  Compact model 4
+  Compact model index: 4
   Stack increment 0
   Registers restored:  \(compact\) A11, B3
   Return register: B3
 
 0x500: 0x80a022e7
-  Compact model 0
+  Compact model index: 0
   0xa0 0x22 pop compact {A11, B3}
   0xe7      RETURN
 
 0x600: 0x84000227
-  Compact model 4
+  Compact model index: 4
   Stack increment 0
   Registers restored:  \(compact\) A11, B3
   Return register: B3
 
 0x700: 0x84000637
-  Compact model 4
+  Compact model index: 4
   Stack increment 0
   Registers restored:  \(compact\) A10, A11, B3, B10
   Return register: B3
 
 0x800: 0x840002d7
-  Compact model 4
+  Compact model index: 4
   Stack increment 0
   Registers restored:  \(compact\) A10, A12, A13, B3
   Return register: B3
 
 0x900: 0x84000c07
-  Compact model 4
+  Compact model index: 4
   Stack increment 0
   Registers restored:  \(compact\) B10, B11
   Return register: B3
 
 0xa00: 0x83ff0027
-  Compact model 3
+  Compact model index: 3
   Restore stack from frame pointer
   Registers restored: A11, A15
   Return register: B3
 
 0xb00: 0x84ff0027
-  Compact model 4
+  Compact model index: 4
   Restore stack from frame pointer
   Registers restored:  \(compact\) A11, A15
   Return register: B3
 
 0xc00: 0x8001c1f7
-  Compact model 0
+  Compact model index: 0
   0x01      sp = sp \+ 16
   0xc1 0xf7 pop frame {B3, \[pad\]}
 
 0xd00: @0x.*
-  Compact model 1
+  Compact model index: 1
   0x01      sp = sp \+ 16
   0xc2 0xf7 0xbf pop frame {\[pad\], A11, B3, \[pad\]}
   0xe7      RETURN
   0xe7      RETURN
 
 0xe00: @0x.*
-  Compact model 1
+  Compact model index: 1
   0x01      sp = sp \+ 16
   0xc2 0xf7 0xfb pop frame {A11, \[pad\], B3, \[pad\]}
   0xe7      RETURN
   0xe7      RETURN
 
 0xf00: @0x.*
-  Compact model 1
+  Compact model index: 1
   0x02      sp = sp \+ 24
   0xc2 0x7f 0xff 0xfb pop frame {A11, \[pad\], \[pad\], \[pad\], \[pad\], B3}
   0xe7      RETURN
diff --git a/gas/testsuite/gas/tic6x/unwind-3.d b/gas/testsuite/gas/tic6x/unwind-3.d
index d03243d..13f5a51 100644
--- a/gas/testsuite/gas/tic6x/unwind-3.d
+++ b/gas/testsuite/gas/tic6x/unwind-3.d
@@ -5,7 +5,7 @@
 Unwind table index '.c6xabi.exidx.text.bar' .*
 
 0x0: 0x830e2807
-  Compact model 3
+  Compact model index: 3
   Stack increment 56
   Registers restored: B11, B13
   Return register: B3
@@ -13,6 +13,6 @@ Unwind table index '.c6xabi.exidx.text.bar' .*
 Unwind table index '.c6xabi.exidx' .*
 
 0x0: 0x80008021
-  Compact model 0
+  Compact model index: 0
   0x00      sp = sp \+ 8
   0x80 0x21 pop {A10, B3}