[binutils-gdb] Fix more fallout from 17f6ade235fc

[Alan Modra]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=be9a9af90654c29c2e90375a64b4d18ef75c56a0

commit be9a9af90654c29c2e90375a64b4d18ef75c56a0
Author: Alan Modra <amodra@gmail.com>
Date:   Fri Sep 21 09:52:08 2018 +0930

    Fix more fallout from 17f6ade235fc
    
    gas/
    	* testsuite/gas/avr/large-debug-line-table.d: Update.
    ld/
    	* testsuite/ld-avr/gc-section-debugline.d: Update.

Diff:
---
 gas/ChangeLog                                  |  4 ++
 gas/testsuite/gas/avr/large-debug-line-table.d |  5 +-
 ld/ChangeLog                                   |  4 ++
 ld/testsuite/ld-avr/gc-section-debugline.d     | 89 +++++++++-----------------
 4 files changed, 42 insertions(+), 60 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8a8eb20..a9ff07d 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-21  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/gas/avr/large-debug-line-table.d: Update.
+
 2018-09-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/23695
diff --git a/gas/testsuite/gas/avr/large-debug-line-table.d b/gas/testsuite/gas/avr/large-debug-line-table.d
index 61612cf..d39e8b8 100644
--- a/gas/testsuite/gas/avr/large-debug-line-table.d
+++ b/gas/testsuite/gas/avr/large-debug-line-table.d
@@ -9,7 +9,6 @@
 Contents of the \.debug_line section:
 
 CU: large-debug-line-table\.c:
-File name                            Line number    Starting address.*
-large-debug-line-table\.c                       1                   0
-
+File +name +Line +number +Starting +address +View +Stmt
+large-debug-line-table.c +1 +0 +x
 #...
diff --git a/ld/ChangeLog b/ld/ChangeLog
index d754500..466c80a 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-21  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/ld-avr/gc-section-debugline.d: Update.
+
 2018-09-20  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* testsuite/ld-checks/over2.s: Add "_main" for LynxOS targets.
diff --git a/ld/testsuite/ld-avr/gc-section-debugline.d b/ld/testsuite/ld-avr/gc-section-debugline.d
index b17e8d8..6e440ff 100644
--- a/ld/testsuite/ld-avr/gc-section-debugline.d
+++ b/ld/testsuite/ld-avr/gc-section-debugline.d
@@ -10,60 +10,35 @@
 Contents of the \.debug_line section:
 
 .*:
-File name                            Line number    Starting address    View
-per-function-debugline.s                      39                   0
-
-per-function-debugline.s                      40                 0x2       1
-
-per-function-debugline.s                      41                 0x4       2
-
-per-function-debugline.s                      42                 0x6       3
-
-per-function-debugline.s                      47                 0x8       4
-
-per-function-debugline.s                      48                 0xc       5
-
-per-function-debugline.s                      49                0x10       6
-
-per-function-debugline.s                      50                0x12       7
-
-per-function-debugline.s                      51                0x16       8
-
-per-function-debugline.s                      52                0x1a       9
-
-per-function-debugline.s                      54                0x1c      10
-
-per-function-debugline.s                      55                0x1e      11
-
-per-function-debugline.s                      56                0x20      12
-
-per-function-debugline.s                      56                0x22      13
-
-per-function-debugline.s                      62                0x22
-
-per-function-debugline.s                      63                0x24       1
-
-per-function-debugline.s                      64                0x26       2
-
-per-function-debugline.s                      65                0x28       3
-
-per-function-debugline.s                      70                0x2a       4
-
-per-function-debugline.s                      71                0x2e       5
-
-per-function-debugline.s                      72                0x32       6
-
-per-function-debugline.s                      73                0x36       7
-
-per-function-debugline.s                      74                0x38       8
-
-per-function-debugline.s                      75                0x3c       9
-
-per-function-debugline.s                      76                0x40      10
-
-per-function-debugline.s                      77                0x44      11
-
-per-function-debugline.s                      79                0x48      12
-
-per-function-debugline.s                      80                0x4a      13
-#pass
+File +name +Line +number +Starting +address +View +Stmt
+per-function-debugline.s +39 +0 +x
+per-function-debugline.s +40 +0x2 +1 +x
+per-function-debugline.s +41 +0x4 +2 +x
+per-function-debugline.s +42 +0x6 +3 +x
+per-function-debugline.s +47 +0x8 +4 +x
+per-function-debugline.s +48 +0xc +5 +x
+per-function-debugline.s +49 +0x10 +6 +x
+per-function-debugline.s +50 +0x12 +7 +x
+per-function-debugline.s +51 +0x16 +8 +x
+per-function-debugline.s +52 +0x1a +9 +x
+per-function-debugline.s +54 +0x1c +10 +x
+per-function-debugline.s +55 +0x1e +11 +x
+per-function-debugline.s +56 +0x20 +12 +x
+per-function-debugline.s +56 +0x22 +13 +x
+
+per-function-debugline.s +62 +0x22 +x
+per-function-debugline.s +63 +0x24 +1 +x
+per-function-debugline.s +64 +0x26 +2 +x
+per-function-debugline.s +65 +0x28 +3 +x
+per-function-debugline.s +70 +0x2a +4 +x
+per-function-debugline.s +71 +0x2e +5 +x
+per-function-debugline.s +72 +0x32 +6 +x
+per-function-debugline.s +73 +0x36 +7 +x
+per-function-debugline.s +74 +0x38 +8 +x
+per-function-debugline.s +75 +0x3c +9 +x
+per-function-debugline.s +76 +0x40 +10 +x
+per-function-debugline.s +77 +0x44 +11 +x
+per-function-debugline.s +79 +0x48 +12 +x
+per-function-debugline.s +80 +0x4a +13 +x
+per-function-debugline.s +81 +0x4c +14 +x
+per-function-debugline.s +81 +0x4e +15 +x