From 2e9e81a8f5f5870900b815b947ad1cbad0a07333 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Fri, 20 Dec 2013 13:52:23 +0000
Subject: 	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.
---
 binutils/dwarf.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'binutils/dwarf.c')

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index c0b18ff..1a62d9f 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -1805,11 +1805,10 @@ read_and_display_attr_value (unsigned long attribute,
     return data;
 
   /* For some attributes we can display further information.  */
-  printf ("\t");
-
   switch (attribute)
     {
     case DW_AT_inline:
+      printf ("\t");
       switch (uvalue)
 	{
 	case DW_INL_not_inlined:
@@ -1832,6 +1831,7 @@ read_and_display_attr_value (unsigned long attribute,
       break;
 
     case DW_AT_language:
+      printf ("\t");
       switch (uvalue)
 	{
 	  /* Ordered by the numeric value of these constants.  */
@@ -1875,6 +1875,7 @@ read_and_display_attr_value (unsigned long attribute,
       break;
 
     case DW_AT_encoding:
+      printf ("\t");
       switch (uvalue)
 	{
 	case DW_ATE_void:		printf ("(void)"); break;
@@ -1915,6 +1916,7 @@ read_and_display_attr_value (unsigned long attribute,
       break;
 
     case DW_AT_accessibility:
+      printf ("\t");
       switch (uvalue)
 	{
 	case DW_ACCESS_public:		printf ("(public)"); break;
@@ -1927,6 +1929,7 @@ read_and_display_attr_value (unsigned long attribute,
       break;
 
     case DW_AT_visibility:
+      printf ("\t");
       switch (uvalue)
 	{
 	case DW_VIS_local:		printf ("(local)"); break;
@@ -1937,6 +1940,7 @@ read_and_display_attr_value (unsigned long attribute,
       break;
 
     case DW_AT_virtuality:
+      printf ("\t");
       switch (uvalue)
 	{
 	case DW_VIRTUALITY_none:	printf ("(none)"); break;
@@ -1947,6 +1951,7 @@ read_and_display_attr_value (unsigned long attribute,
       break;
 
     case DW_AT_identifier_case:
+      printf ("\t");
       switch (uvalue)
 	{
 	case DW_ID_case_sensitive:	printf ("(case_sensitive)"); break;
@@ -1958,6 +1963,7 @@ read_and_display_attr_value (unsigned long attribute,
       break;
 
     case DW_AT_calling_convention:
+      printf ("\t");
       switch (uvalue)
 	{
 	case DW_CC_normal:	printf ("(normal)"); break;
@@ -1973,6 +1979,7 @@ read_and_display_attr_value (unsigned long attribute,
       break;
 
     case DW_AT_ordering:
+      printf ("\t");
       switch (uvalue)
 	{
 	case -1: printf (_("(undefined)")); break;
@@ -1998,7 +2005,7 @@ read_and_display_attr_value (unsigned long attribute,
       if ((dwarf_version < 4
            && (form == DW_FORM_data4 || form == DW_FORM_data8))
 	  || form == DW_FORM_sec_offset)
-	printf (_("(location list)"));
+	printf (_(" (location list)"));
       /* Fall through.  */
     case DW_AT_allocated:
     case DW_AT_associated:
@@ -2010,7 +2017,7 @@ read_and_display_attr_value (unsigned long attribute,
 	{
 	  int need_frame_base;
 
-	  printf ("(");
+	  printf ("\t(");
 	  need_frame_base = decode_location_expression (block_start,
 							pointer_size,
 							offset_size,
@@ -2046,7 +2053,7 @@ read_and_display_attr_value (unsigned long attribute,
 
 	    abbrev_number = read_uleb128 (section->start + uvalue, NULL, end);
 
-	    printf (_("[Abbrev Number: %ld"), abbrev_number);
+	    printf (_("\t[Abbrev Number: %ld"), abbrev_number);
 	    /* Don't look up abbrev for DW_FORM_ref_addr, as it very often will
 	       use different abbrev table, and we don't track .debug_info chunks
 	       yet.  */
-- 
cgit v1.1