Update the assembler to use a version of 3 when generating the header of the .debug_l...

	PR 23941
gas	* dwarf2dbg.c (DWARF2_LINE_VERSION): Change to 3.
	* testsuite/gas/elf/dwarf2-3.d: Update expected output.
	* testsuite/gas/elf/dwarf2-5.d: Likewise.
	* testsuite/gas/i386/debug1.d: Likewise.
	* testsuite/gas/i386/dw2-compress-1.d: Likewise.
	* testsuite/gas/i386/dw2-compress-3a.d: Likewise.
	* testsuite/gas/i386/dw2-compress-3b.d: Likewise.
	* testsuite/gas/i386/dw2-compressed-1.d: Likewise.
	* testsuite/gas/i386/dw2-compressed-3a.d: Likewise.
	* testsuite/gas/i386/dw2-compressed-3b.d: Likewise.
	* testsuite/gas/ia64/pr13167.d: Likewise.
	* testsuite/gas/mips/loc-swap-2.d: Likewise.
	* testsuite/gas/mips/loc-swap.d: Likewise.
	* testsuite/gas/mips/micromips@loc-swap-2.d: Likewise.
	* testsuite/gas/mips/micromips@loc-swap.d: Likewise.
	* testsuite/gas/mips/mips16@loc-swap-2.d: Likewise.
	* testsuite/gas/mips/mips16@loc-swap.d: Likewise.
	* testsuite/gas/mips/mips16e@loc-swap.d: Likewise.

binutils* testsuite/binutils-all/i386/compressed-1a.d: Update expected output.
	* testsuite/binutils-all/x86-64/compressed-1a.d: Likewise.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 612b0ed0a3223a0e76814bdd8d1271848afab7c3..b61ea2656c331c1046b5470d61afa0e4c1948bad 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-03  Nick Clifton  <nickc@redhat.com>
+
+       PR 23941
+       * testsuite/binutils-all/i386/compressed-1a.d: Update expected output.
+       * testsuite/binutils-all/x86-64/compressed-1a.d: Likewise.
+
 2018-12-01  Alan Modra  <amodra@gmail.com>
 
        PR 23946

diff --git a/binutils/testsuite/binutils-all/i386/compressed-1a.d b/binutils/testsuite/binutils-all/i386/compressed-1a.d
index b6c6ecc0f54f4298e6ac08c1b6dfd918d00a5506..70b13cee5d6bfe0a87ea0fd378ff21321f56f4bb 100644 (file)
--- a/binutils/testsuite/binutils-all/i386/compressed-1a.d
+++ b/binutils/testsuite/binutils-all/i386/compressed-1a.d
@@ -64,7 +64,7 @@ Raw dump of debug contents of section .[z]?debug_line:
 
   Offset:                      0x0
   Length:                      64
-  DWARF Version:               2
+  DWARF Version:               .
   Prologue Length:             37
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
index 23151efe0bd71b09951bb6ab6cd1ee56c8454192..3c8eb545024e381e9819a5864ab691684924cf5e 100644 (file)
--- a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
+++ b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
@@ -64,7 +64,7 @@ Raw dump of debug contents of section .[z]?debug_line:
 
   Offset:                      0x0
   Length:                      67
-  DWARF Version:               2
+  DWARF Version:               .
   Prologue Length:             37
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f497b578f469143f2973cb62414da89660ce69c5..5a1eeea28e95dbe77f00ec4fd2b1ee5ddc4c683a 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,25 @@
+2018-12-03  Nick Clifton  <nickc@redhat.com>
+
+       PR 23941
+       * dwarf2dbg.c (DWARF2_LINE_VERSION): Change to 3.
+       * testsuite/gas/elf/dwarf2-3.d: Update expected output.
+       * testsuite/gas/elf/dwarf2-5.d: Likewise.
+       * testsuite/gas/i386/debug1.d: Likewise.
+       * testsuite/gas/i386/dw2-compress-1.d: Likewise.
+       * testsuite/gas/i386/dw2-compress-3a.d: Likewise.
+       * testsuite/gas/i386/dw2-compress-3b.d: Likewise.
+       * testsuite/gas/i386/dw2-compressed-1.d: Likewise.
+       * testsuite/gas/i386/dw2-compressed-3a.d: Likewise.
+       * testsuite/gas/i386/dw2-compressed-3b.d: Likewise.
+       * testsuite/gas/ia64/pr13167.d: Likewise.
+       * testsuite/gas/mips/loc-swap-2.d: Likewise.
+       * testsuite/gas/mips/loc-swap.d: Likewise.
+       * testsuite/gas/mips/micromips@loc-swap-2.d: Likewise.
+       * testsuite/gas/mips/micromips@loc-swap.d: Likewise.
+       * testsuite/gas/mips/mips16@loc-swap-2.d: Likewise.
+       * testsuite/gas/mips/mips16@loc-swap.d: Likewise.
+       * testsuite/gas/mips/mips16e@loc-swap.d: Likewise.
+
 2018-12-01  Alan Modra  <amodra@gmail.com>
 
        PR 23938

diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c
index 57c837b67a4dddee92ce26014ee6012edda8de18..faaaa6ee4523025ff02efd7828006cd1abfc2eeb 100644 (file)
--- a/gas/dwarf2dbg.c
+++ b/gas/dwarf2dbg.c
@@ -97,9 +97,9 @@
 #define DWARF2_ARANGES_VERSION 2
 #endif
 
-/* This implementation output version 2 .debug_line information. */
+/* This implementation outputs version 3 .debug_line information.  */
 #ifndef DWARF2_LINE_VERSION
-#define DWARF2_LINE_VERSION 2
+#define DWARF2_LINE_VERSION 3
 #endif
 
 #include "subsegs.h"

diff --git a/gas/testsuite/gas/elf/dwarf2-3.d b/gas/testsuite/gas/elf/dwarf2-3.d
index c53fcb5408bc31fe21e48023bed1ac517e34093b..594c9a6d9730adeff87bd6f6288bde5bb900722a 100644 (file)
--- a/gas/testsuite/gas/elf/dwarf2-3.d
+++ b/gas/testsuite/gas/elf/dwarf2-3.d
@@ -6,7 +6,7 @@ Raw dump of debug contents of section \.z?debug_line:
 
   Offset:                      0x0
   Length:                      41
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             35
   Minimum Instruction Length:  [0-9]*
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/elf/dwarf2-5.d b/gas/testsuite/gas/elf/dwarf2-5.d
index c7851371e02f9f83fb7135867117d98031b90b88..e04f54652ce19ac54ada57dfdd8ea0fac528a7a8 100644 (file)
--- a/gas/testsuite/gas/elf/dwarf2-5.d
+++ b/gas/testsuite/gas/elf/dwarf2-5.d
@@ -14,7 +14,7 @@ Raw dump of debug contents of section \.debug_line:
 
   Offset:                      0x0
   Length:                      [0-9]*
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             [0-9]*
   Minimum Instruction Length:  [0-9]*
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/i386/debug1.d b/gas/testsuite/gas/i386/debug1.d
index a7daa4b1b6b370685091ddf36e9a0ca90ae4a798..f78ad06bf661822c5f3ec91886477b24b6a31ca4 100644 (file)
--- a/gas/testsuite/gas/i386/debug1.d
+++ b/gas/testsuite/gas/i386/debug1.d
@@ -6,7 +6,7 @@ Raw dump of debug contents of section \.z?debug_line:
 
   Offset:                      0x0
   Length:                      .*
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             .*
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/i386/dw2-compress-1.d b/gas/testsuite/gas/i386/dw2-compress-1.d
index 36663995a1f641fb935593ef114db8de86e3037a..04f7dedf1efcedb801cf3120053362b7a11731b9 100644 (file)
--- a/gas/testsuite/gas/i386/dw2-compress-1.d
+++ b/gas/testsuite/gas/i386/dw2-compress-1.d
@@ -62,7 +62,7 @@ Raw dump of debug contents of section .z?debug_line:
 
   Offset:                      0x0
   Length:                      62
-  DWARF Version:               2
+  DWARF Version:               .
   Prologue Length:             35
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/i386/dw2-compress-3a.d b/gas/testsuite/gas/i386/dw2-compress-3a.d
index 37aec45ae4b46cd798961a64c9592d40b647301d..c6de0d6f57c6a9a1e685692b828d06671f7a726d 100644 (file)
--- a/gas/testsuite/gas/i386/dw2-compress-3a.d
+++ b/gas/testsuite/gas/i386/dw2-compress-3a.d
@@ -68,7 +68,7 @@ Raw dump of debug contents of section .debug_line:
 
   Offset:                      0x0
   Length:                      45
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             39
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/i386/dw2-compress-3b.d b/gas/testsuite/gas/i386/dw2-compress-3b.d
index 7b4aead38a27d40c80b4b7122ce365f2c4bc6ccd..a78e1e25e9f65a2b62f5de365f6072c3561fe848 100644 (file)
--- a/gas/testsuite/gas/i386/dw2-compress-3b.d
+++ b/gas/testsuite/gas/i386/dw2-compress-3b.d
@@ -68,7 +68,7 @@ Raw dump of debug contents of section .debug_line:
 
   Offset:                      0x0
   Length:                      45
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             39
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/i386/dw2-compressed-1.d b/gas/testsuite/gas/i386/dw2-compressed-1.d
index 1b77b22f574414d7e48e66818c506393cc9901ce..ea771c4088276e54c567ade5bc02b9f441d0b764 100644 (file)
--- a/gas/testsuite/gas/i386/dw2-compressed-1.d
+++ b/gas/testsuite/gas/i386/dw2-compressed-1.d
@@ -63,7 +63,7 @@ Raw dump of debug contents of section .debug_line:
 
   Offset:                      0x0
   Length:                      62
-  DWARF Version:               2
+  DWARF Version:               .
   Prologue Length:             35
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/i386/dw2-compressed-3a.d b/gas/testsuite/gas/i386/dw2-compressed-3a.d
index 2e68d9f188a8b08d6985274ed22e375e622e8820..b8b4434a51e7ab0c42927ea79edd9b49503ecff9 100644 (file)
--- a/gas/testsuite/gas/i386/dw2-compressed-3a.d
+++ b/gas/testsuite/gas/i386/dw2-compressed-3a.d
@@ -68,7 +68,7 @@ Raw dump of debug contents of section .debug_line:
 
   Offset:                      0x0
   Length:                      45
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             39
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/i386/dw2-compressed-3b.d b/gas/testsuite/gas/i386/dw2-compressed-3b.d
index 12008bb7fba246a1de034135a2841629b3612bc7..ac51238a96d18973e11d4247342a649a06a08e53 100644 (file)
--- a/gas/testsuite/gas/i386/dw2-compressed-3b.d
+++ b/gas/testsuite/gas/i386/dw2-compressed-3b.d
@@ -68,7 +68,7 @@ Raw dump of debug contents of section .debug_line:
 
   Offset:                      0x0
   Length:                      45
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             39
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/ia64/pr13167.d b/gas/testsuite/gas/ia64/pr13167.d
index ecce154df42d2aa986d133ff613e3c1f6be34d79..e447cb64cc6592312793b640f01fb033619a71cf 100644 (file)
--- a/gas/testsuite/gas/ia64/pr13167.d
+++ b/gas/testsuite/gas/ia64/pr13167.d
@@ -4,7 +4,7 @@ Raw dump of debug contents of section \.debug_line:
 
   Offset:                      0x0
   Length:                      51
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             26
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/mips/loc-swap-2.d b/gas/testsuite/gas/mips/loc-swap-2.d
index 8eb2c1c76e7dc967b78074a9fcbdb164314519cb..27bc810baf8ab3daf25971aafbd4cb1e6f24498d 100644 (file)
--- a/gas/testsuite/gas/mips/loc-swap-2.d
+++ b/gas/testsuite/gas/mips/loc-swap-2.d
@@ -8,7 +8,7 @@ Raw dump of debug contents of section .debug_line:
 
   Offset:                      0x0
   Length:                      60
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             35
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/mips/loc-swap.d b/gas/testsuite/gas/mips/loc-swap.d
index ef44136c4484284b910bae7f7b3976ce0967d111..80c7be4994b39f2e681c20ec717efed11e08a70f 100644 (file)
--- a/gas/testsuite/gas/mips/loc-swap.d
+++ b/gas/testsuite/gas/mips/loc-swap.d
@@ -11,7 +11,7 @@ Raw dump of debug contents of section \.debug_line:
 
   Offset:                      0x0
   Length:                      67
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             33
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/mips/micromips@loc-swap-2.d b/gas/testsuite/gas/mips/micromips@loc-swap-2.d
index 7f19ad58b9b69bef50324af710932cb4a2d3e6c4..c63a854fded6957ab77670be8d41f30156f75722 100644 (file)
--- a/gas/testsuite/gas/mips/micromips@loc-swap-2.d
+++ b/gas/testsuite/gas/mips/micromips@loc-swap-2.d
@@ -8,7 +8,7 @@ Raw dump of debug contents of section .debug_line:
 
   Offset:                      0x0
   Length:                      60
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             35
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/mips/micromips@loc-swap.d b/gas/testsuite/gas/mips/micromips@loc-swap.d
index 972cf5667b373c08eea7102d215cc282d486aa1b..6ebb510d274d535e06a0ad3f1ca90ac44e440cf4 100644 (file)
--- a/gas/testsuite/gas/mips/micromips@loc-swap.d
+++ b/gas/testsuite/gas/mips/micromips@loc-swap.d
@@ -12,7 +12,7 @@ Raw dump of debug contents of section \.debug_line:
 
   Offset:                      0x0
   Length:                      67
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             33
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/mips/mips16@loc-swap-2.d b/gas/testsuite/gas/mips/mips16@loc-swap-2.d
index 8fd71e5ae7c69b64fa5b60d1a15476d315bc40d1..39fd33da9e28e0256e66c4226c96231fbc33ce2e 100644 (file)
--- a/gas/testsuite/gas/mips/mips16@loc-swap-2.d
+++ b/gas/testsuite/gas/mips/mips16@loc-swap-2.d
@@ -8,7 +8,7 @@ Raw dump of debug contents of section .debug_line:
 
   Offset:                      0x0
   Length:                      60
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             35
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/mips/mips16@loc-swap.d b/gas/testsuite/gas/mips/mips16@loc-swap.d
index 0327e98410b79df4df2dbd329bb5d993709a8b30..14cd7669580486ce91fe0902c5e3eedfa5bd7595 100644 (file)
--- a/gas/testsuite/gas/mips/mips16@loc-swap.d
+++ b/gas/testsuite/gas/mips/mips16@loc-swap.d
@@ -11,7 +11,7 @@ Raw dump of debug contents of section \.debug_line:
 
   Offset:                      0x0
   Length:                      67
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             33
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1

diff --git a/gas/testsuite/gas/mips/mips16e@loc-swap.d b/gas/testsuite/gas/mips/mips16e@loc-swap.d
index 03d08a2dd65ce471b1a7291c58c75a5f682f62c7..62e342b14d1858a92f820f73a104e194740304fc 100644 (file)
--- a/gas/testsuite/gas/mips/mips16e@loc-swap.d
+++ b/gas/testsuite/gas/mips/mips16e@loc-swap.d
@@ -11,7 +11,7 @@ Raw dump of debug contents of section \.debug_line:
 
   Offset:                      0x0
   Length:                      67
-  DWARF Version:               2
+  DWARF Version:               3
   Prologue Length:             33
   Minimum Instruction Length:  1
   Initial value of 'is_stmt':  1