This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [PATCH] binutils --dwarf=decodedline: Add display of is_stmt flag
On Thu, Sep 20, 2018 at 10:48 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Wed, Sep 19, 2018 at 11:30 AM, John Darrington
> <john@darrington.wattle.id.au> wrote:
>> binutils/
>> * dwarf.c (display_debug_lines_decoded): Add display of is_stmt.
>> * testsuite/binutils-all/dw5.W: Deal with the consequences.
>> * testsuite/binutils-all/objdump.WL: Deal with the consequences.
>> ---
>> binutils/dwarf.c | 11 ++++++++---
>> binutils/testsuite/binutils-all/dw5.W | 14 +++++++-------
>> binutils/testsuite/binutils-all/objdump.WL | 2 +-
>> 3 files changed, 16 insertions(+), 11 deletions(-)
>>
>
> This caused:
>
> https://sourceware.org/bugzilla/show_bug.cgi?id=23695
>
I checked in this patch to fix it.
--
H.J.
From ddb77fcccbbff14d6426d01357942e88d240dfbe Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 20 Sep 2018 10:55:36 -0700
Subject: [PATCH] gas: Update expected outputs of "readelf -wL"
Update expected outputs of "readelf -wL" for
commit 17f6ade235fc96b4e572b5251b344d426c5f1cd5
Author: John Darrington <john@darrington.wattle.id.au>
Date: Wed Sep 19 19:56:29 2018 +0200
binutils --dwarf=decodedline: Add display of is_stmt flag
which adds display of is_stmt flag.
PR binutils/23695
* testsuite/gas/elf/dwarf2-11.d: Update expected outputs of
"readelf -wL".
* testsuite/gas/elf/dwarf2-12.d: Likewise.
* testsuite/gas/elf/dwarf2-13.d: Likewise.
* testsuite/gas/elf/dwarf2-14.d: Likewise.
* testsuite/gas/elf/dwarf2-15.d: Likewise.
* testsuite/gas/elf/dwarf2-16.d: Likewise.
* testsuite/gas/elf/dwarf2-17.d: Likewise.
* testsuite/gas/elf/dwarf2-18.d: Likewise.
* testsuite/gas/elf/dwarf2-5.d: Likewise.
* testsuite/gas/elf/dwarf2-6.d: Likewise.
* testsuite/gas/elf/dwarf2-7.d: Likewise.
---
gas/ChangeLog | 16 ++++++++++++++++
gas/testsuite/gas/elf/dwarf2-11.d | 8 ++++----
gas/testsuite/gas/elf/dwarf2-12.d | 10 +++++-----
gas/testsuite/gas/elf/dwarf2-13.d | 10 +++++-----
gas/testsuite/gas/elf/dwarf2-14.d | 10 +++++-----
gas/testsuite/gas/elf/dwarf2-15.d | 10 +++++-----
gas/testsuite/gas/elf/dwarf2-16.d | 10 +++++-----
gas/testsuite/gas/elf/dwarf2-17.d | 10 +++++-----
gas/testsuite/gas/elf/dwarf2-18.d | 10 +++++-----
gas/testsuite/gas/elf/dwarf2-5.d | 28 ++++++++++++++--------------
gas/testsuite/gas/elf/dwarf2-6.d | 24 ++++++++++++------------
gas/testsuite/gas/elf/dwarf2-7.d | 10 +++++-----
12 files changed, 86 insertions(+), 70 deletions(-)
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 637fc65648..8a8eb20373 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,19 @@
+2018-09-20 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR binutils/23695
+ * testsuite/gas/elf/dwarf2-11.d: Update expected outputs of
+ "readelf -wL".
+ * testsuite/gas/elf/dwarf2-12.d: Likewise.
+ * testsuite/gas/elf/dwarf2-13.d: Likewise.
+ * testsuite/gas/elf/dwarf2-14.d: Likewise.
+ * testsuite/gas/elf/dwarf2-15.d: Likewise.
+ * testsuite/gas/elf/dwarf2-16.d: Likewise.
+ * testsuite/gas/elf/dwarf2-17.d: Likewise.
+ * testsuite/gas/elf/dwarf2-18.d: Likewise.
+ * testsuite/gas/elf/dwarf2-5.d: Likewise.
+ * testsuite/gas/elf/dwarf2-6.d: Likewise.
+ * testsuite/gas/elf/dwarf2-7.d: Likewise.
+
2018-09-20 Maciej W. Rozycki <macro@linux-mips.org>
* config/tc-s12z.c (lex_opr): Use an auxiliary unsigned variable
diff --git a/gas/testsuite/gas/elf/dwarf2-11.d b/gas/testsuite/gas/elf/dwarf2-11.d
index bd0e6ca0c5..2a5ec84d4d 100644
--- a/gas/testsuite/gas/elf/dwarf2-11.d
+++ b/gas/testsuite/gas/elf/dwarf2-11.d
@@ -9,7 +9,7 @@
Contents of the \.debug_line section:
CU: dwarf2-11\.c:
-File name *Line number *Starting address *View
-dwarf2-11\.c *1 *0x4
-dwarf2-11\.c *2 *0x8
-dwarf2-11\.c *2 *0x8 *1
+File name *Line number *Starting address *View +Stmt
+dwarf2-11\.c *1 *0x4 +x
+dwarf2-11\.c *2 *0x8 +x
+dwarf2-11\.c *2 *0x8 *1 +x
diff --git a/gas/testsuite/gas/elf/dwarf2-12.d b/gas/testsuite/gas/elf/dwarf2-12.d
index 9a07b5914f..58cda41bb0 100644
--- a/gas/testsuite/gas/elf/dwarf2-12.d
+++ b/gas/testsuite/gas/elf/dwarf2-12.d
@@ -13,8 +13,8 @@ Hex dump of section '\.rodata':
Contents of the \.debug_line section:
CU: dwarf2-12\.c:
-File name *Line number *Starting address *View
-dwarf2-12\.c *1 *0
-dwarf2-12\.c *2 *0
-dwarf2-12\.c *3 *0 *1
-dwarf2-12\.c *3 *0x4
+File name *Line number *Starting address *View +Stmt
+dwarf2-12\.c *1 *0 +x
+dwarf2-12\.c *2 *0 +x
+dwarf2-12\.c *3 *0 *1 +x
+dwarf2-12\.c *3 *0x4 +x
diff --git a/gas/testsuite/gas/elf/dwarf2-13.d b/gas/testsuite/gas/elf/dwarf2-13.d
index 8ec16eb6cb..bcda370250 100644
--- a/gas/testsuite/gas/elf/dwarf2-13.d
+++ b/gas/testsuite/gas/elf/dwarf2-13.d
@@ -12,8 +12,8 @@ Hex dump of section '\.rodata':
Contents of the \.debug_line section:
CU: dwarf2-13\.c:
-File name *Line number *Starting address *View
-dwarf2-13\.c *1 *0x4
-dwarf2-13\.c *2 *0x8
-dwarf2-13\.c *3 *0x8 *1
-dwarf2-13\.c *3 *0xc
+File name *Line number *Starting address *View +Stmt
+dwarf2-13\.c *1 *0x4 +x
+dwarf2-13\.c *2 *0x8 +x
+dwarf2-13\.c *3 *0x8 *1 +x
+dwarf2-13\.c *3 *0xc +x
diff --git a/gas/testsuite/gas/elf/dwarf2-14.d b/gas/testsuite/gas/elf/dwarf2-14.d
index 14193893ff..d0ee7c30e4 100644
--- a/gas/testsuite/gas/elf/dwarf2-14.d
+++ b/gas/testsuite/gas/elf/dwarf2-14.d
@@ -12,8 +12,8 @@ Hex dump of section '\.rodata':
Contents of the \.debug_line section:
CU: dwarf2-14\.c:
-File name *Line number *Starting address *View
-dwarf2-14\.c *1 *0
-dwarf2-14\.c *2 *0
-dwarf2-14\.c *3 *0 *1
-dwarf2-14\.c *3 *0x4
+File name *Line number *Starting address *View +Stmt
+dwarf2-14\.c *1 *0 +x
+dwarf2-14\.c *2 *0 +x
+dwarf2-14\.c *3 *0 *1 +x
+dwarf2-14\.c *3 *0x4 +x
diff --git a/gas/testsuite/gas/elf/dwarf2-15.d b/gas/testsuite/gas/elf/dwarf2-15.d
index cabb6a649a..77ba210841 100644
--- a/gas/testsuite/gas/elf/dwarf2-15.d
+++ b/gas/testsuite/gas/elf/dwarf2-15.d
@@ -12,8 +12,8 @@ Hex dump of section '\.rodata':
Contents of the \.debug_line section:
CU: dwarf2-15\.c:
-File name *Line number *Starting address *View
-dwarf2-15\.c *1 *0
-dwarf2-15\.c *2 *0x4
-dwarf2-15\.c *3 *0x4 *1
-dwarf2-15\.c *3 *0x8
+File name *Line number *Starting address *View +Stmt
+dwarf2-15\.c *1 *0 +x
+dwarf2-15\.c *2 *0x4 +x
+dwarf2-15\.c *3 *0x4 *1 +x
+dwarf2-15\.c *3 *0x8 +x
diff --git a/gas/testsuite/gas/elf/dwarf2-16.d b/gas/testsuite/gas/elf/dwarf2-16.d
index a7b057140b..b8a45c8f73 100644
--- a/gas/testsuite/gas/elf/dwarf2-16.d
+++ b/gas/testsuite/gas/elf/dwarf2-16.d
@@ -13,8 +13,8 @@ Hex dump of section '\.rodata':
Contents of the \.debug_line section:
CU: dwarf2-16\.c:
-File name *Line number *Starting address *View
-dwarf2-16\.c *1 *0
-dwarf2-16\.c *2 *0x4
-dwarf2-16\.c *3 *0x4 *1
-dwarf2-16\.c *3 *0x8
+File name *Line number *Starting address *View +Stmt
+dwarf2-16\.c *1 *0 +x
+dwarf2-16\.c *2 *0x4 +x
+dwarf2-16\.c *3 *0x4 *1 +x
+dwarf2-16\.c *3 *0x8 +x
diff --git a/gas/testsuite/gas/elf/dwarf2-17.d b/gas/testsuite/gas/elf/dwarf2-17.d
index f5a54489b6..fbd474e756 100644
--- a/gas/testsuite/gas/elf/dwarf2-17.d
+++ b/gas/testsuite/gas/elf/dwarf2-17.d
@@ -13,8 +13,8 @@ Hex dump of section '\.rodata':
Contents of the \.debug_line section:
CU: dwarf2-17\.c:
-File name *Line number *Starting address *View
-dwarf2-17\.c *1 *0
-dwarf2-17\.c *2 *0x4
-dwarf2-17\.c *3 *0x8
-dwarf2-17\.c *3 *0xc
+File name *Line number *Starting address *View +Stmt
+dwarf2-17\.c *1 *0 +x
+dwarf2-17\.c *2 *0x4 +x
+dwarf2-17\.c *3 *0x8 +x
+dwarf2-17\.c *3 *0xc +x
diff --git a/gas/testsuite/gas/elf/dwarf2-18.d b/gas/testsuite/gas/elf/dwarf2-18.d
index b31739adb6..a93a9f98de 100644
--- a/gas/testsuite/gas/elf/dwarf2-18.d
+++ b/gas/testsuite/gas/elf/dwarf2-18.d
@@ -12,8 +12,8 @@ Hex dump of section '\.rodata':
Contents of the \.debug_line section:
CU: dwarf2-18\.c:
-File name *Line number *Starting address *View
-dwarf2-18\.c *1 *0
-dwarf2-18\.c *2 *0 *1
-dwarf2-18\.c *3 *0x4
-dwarf2-18\.c *3 *0x8
+File name *Line number *Starting address *View +Stmt
+dwarf2-18\.c *1 *0 +x
+dwarf2-18\.c *2 *0 *1 +x
+dwarf2-18\.c *3 *0x4 +x
+dwarf2-18\.c *3 *0x8 +x
diff --git a/gas/testsuite/gas/elf/dwarf2-5.d b/gas/testsuite/gas/elf/dwarf2-5.d
index 437f4dfa31..c7851371e0 100644
--- a/gas/testsuite/gas/elf/dwarf2-5.d
+++ b/gas/testsuite/gas/elf/dwarf2-5.d
@@ -63,17 +63,17 @@ Raw dump of debug contents of section \.debug_line:
Contents of the \.debug_line section:
CU: dwarf2-5\.c:
-File name *Line number *Starting address *View
-dwarf2-5\.c *1 *0
-dwarf2-5\.c *2 *0 *1
-dwarf2-5\.c *3 *0x4
-dwarf2-5\.c *4 *0x4 *1
-dwarf2-5\.c *5 *0x4 *2
-dwarf2-5\.c *6 *0x8
-dwarf2-5\.c *7 *0xc
-dwarf2-5\.c *8 *0xc *1
-dwarf2-5\.c *9 *0x10
-dwarf2-5\.c *10 *0x10 *1
-dwarf2-5\.c *11 *0x10 *2
-dwarf2-5\.c *12 *0x10 *3
-dwarf2-5\.c *12 *0x14
+File name *Line number *Starting address *View +Stmt
+dwarf2-5\.c *1 *0 +x
+dwarf2-5\.c *2 *0 *1 +x
+dwarf2-5\.c *3 *0x4 +x
+dwarf2-5\.c *4 *0x4 *1 +x
+dwarf2-5\.c *5 *0x4 *2 +x
+dwarf2-5\.c *6 *0x8 +x
+dwarf2-5\.c *7 *0xc +x
+dwarf2-5\.c *8 *0xc *1 +x
+dwarf2-5\.c *9 *0x10 +x
+dwarf2-5\.c *10 *0x10 *1 +x
+dwarf2-5\.c *11 *0x10 *2 +x
+dwarf2-5\.c *12 *0x10 *3 +x
+dwarf2-5\.c *12 *0x14 +x
diff --git a/gas/testsuite/gas/elf/dwarf2-6.d b/gas/testsuite/gas/elf/dwarf2-6.d
index 415de4c466..5bcbc8897d 100644
--- a/gas/testsuite/gas/elf/dwarf2-6.d
+++ b/gas/testsuite/gas/elf/dwarf2-6.d
@@ -64,15 +64,15 @@ Raw dump of debug contents of section .debug_line:
Contents of the \.debug_line section:
CU: dwarf2-6\.c:
-File name *Line number *Starting address *View
-dwarf2-6\.c *1 *0
-dwarf2-6\.c *1 *0 *1
-dwarf2-6\.c *1 *0x1
-dwarf2-6\.c *1 *0x1 *1
-dwarf2-6\.c *1 *0x2
-dwarf2-6\.c *1 *0x3 *1
-dwarf2-6\.c *2 *0x3 *2
-dwarf2-6\.c *3 *0x4
-dwarf2-6\.c *3 *0x4 *1
-dwarf2-6\.c *3 *0xf3
-dwarf2-6\.c *3 *0x100
+File name *Line number *Starting address *View +Stmt
+dwarf2-6\.c *1 *0 +x
+dwarf2-6\.c *1 *0 *1 +x
+dwarf2-6\.c *1 *0x1 +x
+dwarf2-6\.c *1 *0x1 *1 +x
+dwarf2-6\.c *1 *0x2 +x
+dwarf2-6\.c *1 *0x3 *1 +x
+dwarf2-6\.c *2 *0x3 *2 +x
+dwarf2-6\.c *3 *0x4 +x
+dwarf2-6\.c *3 *0x4 *1 +x
+dwarf2-6\.c *3 *0xf3 +x
+dwarf2-6\.c *3 *0x100 +x
diff --git a/gas/testsuite/gas/elf/dwarf2-7.d b/gas/testsuite/gas/elf/dwarf2-7.d
index fec6cf861f..2f457aa186 100644
--- a/gas/testsuite/gas/elf/dwarf2-7.d
+++ b/gas/testsuite/gas/elf/dwarf2-7.d
@@ -12,8 +12,8 @@ Hex dump of section '\.rodata':
Contents of the \.debug_line section:
CU: dwarf2-7\.c:
-File name *Line number *Starting address *View
-dwarf2-7\.c *1 *0
-dwarf2-7\.c *2 *0
-dwarf2-7\.c *3 *0 *1
-dwarf2-7\.c *3 *0x.
+File name *Line number *Starting address *View +Stmt
+dwarf2-7\.c *1 *0 +x
+dwarf2-7\.c *2 *0 +x
+dwarf2-7\.c *3 *0 *1 +x
+dwarf2-7\.c *3 *0x. +x
--
2.17.1