PR binutils/16218

	* dwarf.c (read_and_display_attr_value): Only print a tab
	character if it preceeds further text.

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

	* gas/elf/dwarf2-1.d: Update expected objdump output.
	* gas/elf/dwarf2-2.d: Likewise.
	* gas/i386/dw2-compress-1.d: Likewise.

5 files changed, 72 insertions, 64 deletions

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index a1e6724..45defaf 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-20  Nick Clifton  <nickc@redhat.com>
+
+	PR binutils/16218
+	* binutils-all/dw2-1.W:	Update expected objdump output.
+	* binutils-all/i386/compressed-1a.d: Likewise.
+	* binutils-all/objdump.W: Likewise.
+	* binutils-all/x86-64/compressed-1a.d: Likewise.
+
 2013-12-19  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/16317
diff --git a/binutils/testsuite/binutils-all/dw2-1.W b/binutils/testsuite/binutils-all/dw2-1.W
index 85ce9dd..3811019 100644
--- a/binutils/testsuite/binutils-all/dw2-1.W
+++ b/binutils/testsuite/binutils-all/dw2-1.W
@@ -9,24 +9,24 @@ Contents of the .debug_info section:
    Abbrev Offset: 0x0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_stmt_list   : 0x0	
-    <10>   DW_AT_high_pc     : 0x.	
-    <14>   DW_AT_low_pc      : 0x.	
-    <18>   DW_AT_name        : file1.txt	
-    <22>   DW_AT_producer    : GNU C 3.3.3	
+    <c>   DW_AT_stmt_list   : 0x0
+    <10>   DW_AT_high_pc     : 0x.
+    <14>   DW_AT_low_pc      : 0x.
+    <18>   DW_AT_name        : file1.txt
+    <22>   DW_AT_producer    : GNU C 3.3.3
     <2e>   DW_AT_language    : 1	\(ANSI C\)
  <1><2f>: Abbrev Number: 2 \(DW_TAG_subprogram\)
-    <30>   DW_AT_external    : 1	
-    <31>   DW_AT_decl_file   : 1	
-    <32>   DW_AT_decl_line   : 2	
-    <33>   DW_AT_name        : func_cu1	
-    <3c>   DW_AT_type        : <0x4a>	
-    <40>   DW_AT_low_pc      : 0x.	
-    <44>   DW_AT_high_pc     : 0x.	
+    <30>   DW_AT_external    : 1
+    <31>   DW_AT_decl_file   : 1
+    <32>   DW_AT_decl_line   : 2
+    <33>   DW_AT_name        : func_cu1
+    <3c>   DW_AT_type        : <0x4a>
+    <40>   DW_AT_low_pc      : 0x.
+    <44>   DW_AT_high_pc     : 0x.
     <48>   DW_AT_frame_base  : 1 byte block: 55 	\(DW_OP_reg5 \([^()]*\)\)
  <1><4a>: Abbrev Number: 3 \(DW_TAG_base_type\)
-    <4b>   DW_AT_name        : int	
-    <4f>   DW_AT_byte_size   : 4	
+    <4b>   DW_AT_name        : int
+    <4f>   DW_AT_byte_size   : 4
     <50>   DW_AT_encoding    : 5	\(signed\)
  <1><51>: Abbrev Number: 0
 
diff --git a/binutils/testsuite/binutils-all/i386/compressed-1a.d b/binutils/testsuite/binutils-all/i386/compressed-1a.d
index f1883aa..5f02def 100644
--- a/binutils/testsuite/binutils-all/i386/compressed-1a.d
+++ b/binutils/testsuite/binutils-all/i386/compressed-1a.d
@@ -35,28 +35,28 @@ Contents of the .[z]?debug_info section:
    Abbrev Offset: 0x0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_producer    : \(indirect string, offset: 0x0\): GNU C 4.4.4	
+    <c>   DW_AT_producer    : \(indirect string, offset: 0x0\): GNU C 4.4.4
     <10>   DW_AT_language    : 1	\(ANSI C\)
-    <11>   DW_AT_name        : \(indirect string, offset: 0x18\): compressed-1.c	
-    <15>   DW_AT_comp_dir    : \(indirect string, offset: 0x16\): .	
-    <19>   DW_AT_low_pc      : 0x0	
-    <1d>   DW_AT_high_pc     : 0x1b	
-    <21>   DW_AT_stmt_list   : 0x0	
+    <11>   DW_AT_name        : \(indirect string, offset: 0x18\): compressed-1.c
+    <15>   DW_AT_comp_dir    : \(indirect string, offset: 0x16\): .
+    <19>   DW_AT_low_pc      : 0x0
+    <1d>   DW_AT_high_pc     : 0x1b
+    <21>   DW_AT_stmt_list   : 0x0
  <1><25>: Abbrev Number: 2 \(DW_TAG_subprogram\)
-    <26>   DW_AT_external    : 1	
-    <27>   DW_AT_name        : \(indirect string, offset: 0xc\): foo2	
-    <2b>   DW_AT_decl_file   : 1	
-    <2c>   DW_AT_decl_line   : 10	
-    <2d>   DW_AT_low_pc      : 0x0	
-    <31>   DW_AT_high_pc     : 0x2	
+    <26>   DW_AT_external    : 1
+    <27>   DW_AT_name        : \(indirect string, offset: 0xc\): foo2
+    <2b>   DW_AT_decl_file   : 1
+    <2c>   DW_AT_decl_line   : 10
+    <2d>   DW_AT_low_pc      : 0x0
+    <31>   DW_AT_high_pc     : 0x2
     <35>   DW_AT_frame_base  : 1 byte block: 9c 	\(DW_OP_call_frame_cfa\)
  <1><37>: Abbrev Number: 2 \(DW_TAG_subprogram\)
-    <38>   DW_AT_external    : 1	
-    <39>   DW_AT_name        : \(indirect string, offset: 0x11\): foo1	
-    <3d>   DW_AT_decl_file   : 1	
-    <3e>   DW_AT_decl_line   : 4	
-    <3f>   DW_AT_low_pc      : 0x10	
-    <43>   DW_AT_high_pc     : 0x1b	
+    <38>   DW_AT_external    : 1
+    <39>   DW_AT_name        : \(indirect string, offset: 0x11\): foo1
+    <3d>   DW_AT_decl_file   : 1
+    <3e>   DW_AT_decl_line   : 4
+    <3f>   DW_AT_low_pc      : 0x10
+    <43>   DW_AT_high_pc     : 0x1b
     <47>   DW_AT_frame_base  : 1 byte block: 9c 	\(DW_OP_call_frame_cfa\)
  <1><49>: Abbrev Number: 0
 
diff --git a/binutils/testsuite/binutils-all/objdump.W b/binutils/testsuite/binutils-all/objdump.W
index f544d82..48dde48 100644
--- a/binutils/testsuite/binutils-all/objdump.W
+++ b/binutils/testsuite/binutils-all/objdump.W
@@ -9,24 +9,24 @@ Contents of the .debug_info section:
    Abbrev Offset: 0x0
    Pointer Size:  4
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_stmt_list   : 0x0	
-    <10>   DW_AT_high_pc     : 0x.	
-    <14>   DW_AT_low_pc      : 0x.	
-    <18>   DW_AT_name        : file1.txt	
-    <22>   DW_AT_producer    : GNU C 3.3.3	
+    <c>   DW_AT_stmt_list   : 0x0
+    <10>   DW_AT_high_pc     : 0x.
+    <14>   DW_AT_low_pc      : 0x.
+    <18>   DW_AT_name        : file1.txt
+    <22>   DW_AT_producer    : GNU C 3.3.3
     <2e>   DW_AT_language    : 1	\(ANSI C\)
  <1><2f>: Abbrev Number: 2 \(DW_TAG_subprogram\)
-    <30>   DW_AT_external    : 1	
-    <31>   DW_AT_decl_file   : 1	
-    <32>   DW_AT_decl_line   : 2	
-    <33>   DW_AT_name        : func_cu1	
-    <3c>   DW_AT_type        : <0x4a>	
-    <40>   DW_AT_low_pc      : 0x.	
-    <44>   DW_AT_high_pc     : 0x.	
+    <30>   DW_AT_external    : 1
+    <31>   DW_AT_decl_file   : 1
+    <32>   DW_AT_decl_line   : 2
+    <33>   DW_AT_name        : func_cu1
+    <3c>   DW_AT_type        : <0x4a>
+    <40>   DW_AT_low_pc      : 0x.
+    <44>   DW_AT_high_pc     : 0x.
     <48>   DW_AT_frame_base  : 1 byte block: 55 	\(DW_OP_reg5 \([^()]*\)\)
  <1><4a>: Abbrev Number: 3 \(DW_TAG_base_type\)
-    <4b>   DW_AT_name        : int	
-    <4f>   DW_AT_byte_size   : 4	
+    <4b>   DW_AT_name        : int
+    <4f>   DW_AT_byte_size   : 4
     <50>   DW_AT_encoding    : 5	\(signed\)
  <1><51>: Abbrev Number: 0
 
diff --git a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
index 19471ab..574b719 100644
--- a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
+++ b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d
@@ -35,28 +35,28 @@ Contents of the .[z]?debug_info section:
    Abbrev Offset: 0x0
    Pointer Size:  8
  <0><b>: Abbrev Number: 1 \(DW_TAG_compile_unit\)
-    <c>   DW_AT_producer    : \(indirect string, offset: 0x0\): GNU C 4.4.4	
+    <c>   DW_AT_producer    : \(indirect string, offset: 0x0\): GNU C 4.4.4
     <10>   DW_AT_language    : 1	\(ANSI C\)
-    <11>   DW_AT_name        : \(indirect string, offset: 0x18\): compressed-1.c	
-    <15>   DW_AT_comp_dir    : \(indirect string, offset: 0x16\): .	
-    <19>   DW_AT_low_pc      : 0x0	
-    <21>   DW_AT_high_pc     : 0x15	
-    <29>   DW_AT_stmt_list   : 0x0	
+    <11>   DW_AT_name        : \(indirect string, offset: 0x18\): compressed-1.c
+    <15>   DW_AT_comp_dir    : \(indirect string, offset: 0x16\): .
+    <19>   DW_AT_low_pc      : 0x0
+    <21>   DW_AT_high_pc     : 0x15
+    <29>   DW_AT_stmt_list   : 0x0
  <1><2d>: Abbrev Number: 2 \(DW_TAG_subprogram\)
-    <2e>   DW_AT_external    : 1	
-    <2f>   DW_AT_name        : \(indirect string, offset: 0xc\): foo2	
-    <33>   DW_AT_decl_file   : 1	
-    <34>   DW_AT_decl_line   : 10	
-    <35>   DW_AT_low_pc      : 0x0	
-    <3d>   DW_AT_high_pc     : 0x2	
+    <2e>   DW_AT_external    : 1
+    <2f>   DW_AT_name        : \(indirect string, offset: 0xc\): foo2
+    <33>   DW_AT_decl_file   : 1
+    <34>   DW_AT_decl_line   : 10
+    <35>   DW_AT_low_pc      : 0x0
+    <3d>   DW_AT_high_pc     : 0x2
     <45>   DW_AT_frame_base  : 1 byte block: 9c 	\(DW_OP_call_frame_cfa\)
  <1><47>: Abbrev Number: 2 \(DW_TAG_subprogram\)
-    <48>   DW_AT_external    : 1	
-    <49>   DW_AT_name        : \(indirect string, offset: 0x11\): foo1	
-    <4d>   DW_AT_decl_file   : 1	
-    <4e>   DW_AT_decl_line   : 4	
-    <4f>   DW_AT_low_pc      : 0x10	
-    <57>   DW_AT_high_pc     : 0x15	
+    <48>   DW_AT_external    : 1
+    <49>   DW_AT_name        : \(indirect string, offset: 0x11\): foo1
+    <4d>   DW_AT_decl_file   : 1
+    <4e>   DW_AT_decl_line   : 4
+    <4f>   DW_AT_low_pc      : 0x10
+    <57>   DW_AT_high_pc     : 0x15
     <5f>   DW_AT_frame_base  : 1 byte block: 9c 	\(DW_OP_call_frame_cfa\)
  <1><61>: Abbrev Number: 0