Disable the inclusion of logical input files in the assembler listing output unless...

[deliverable/binutils-gdb.git] / gas / listing.c

diff --git a/gas/listing.c b/gas/listing.c
index e5fb3a0a9dd4c5405cdf439642b728da1e4ce2fa..31eae98ae498dfa5054428e6ee5c07d9cd6c991b 100644 (file)
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -1,5 +1,5 @@
 /* listing.c - maintain assembly listings
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
+   Copyright (C) 1991-2017 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -41,7 +41,7 @@
   will affect the page they are on, as well as any subsequent page
 
  .eject
-       Thow a page
+       Throw a page
  .list
        Increment the enable listing counter
  .nolist
@@ -324,7 +324,13 @@ listing_newline (char *ps)
     }
 #endif
 
-  file = as_where (&line);
+  /* PR 21977 - use the physical file name not the logical one unless high
+     level source files are being included in the listing.  */
+  if (listing & LISTING_HLL)
+    file = as_where (&line);
+  else
+    file = as_where_physical (&line);
+
   if (ps == NULL)
     {
       if (line == last_line
@@ -347,7 +353,7 @@ listing_newline (char *ps)
       if (strcmp (file, _("{standard input}")) == 0
          && input_line_pointer != NULL)
        {
-         char *copy;
+         char *copy, *src, *dest;
          int len;
          int seen_quote = 0;
          int seen_slash = 0;
@@ -367,25 +373,22 @@ listing_newline (char *ps)
 
          len = copy - input_line_pointer + 1;
 
-         copy = (char *) xmalloc (len);
-
-         if (copy != NULL)
-           {
-             char *src = input_line_pointer;
-             char *dest = copy;
+         copy = XNEWVEC (char, len);
 
-             while (--len)
-               {
-                 unsigned char c = *src++;
+         src = input_line_pointer;
+         dest = copy;
 
-                 /* Omit control characters in the listing.  */
-                 if (!ISCNTRL (c))
-                   *dest++ = c;
-               }
+         while (--len)
+           {
+             unsigned char c = *src++;
 
-             *dest = 0;
+             /* Omit control characters in the listing.  */
+             if (!ISCNTRL (c))
+               *dest++ = c;
            }
 
+         *dest = 0;
+
          new_i->line_contents = copy;
        }
       else
@@ -1200,8 +1203,8 @@ listing_listing (char *name ATTRIBUTE_UNUSED)
   int show_listing = 1;
   unsigned int width;
 
-  buffer = (char *) xmalloc (listing_rhs_width);
-  data_buffer = (char *) xmalloc (MAX_BYTES);
+  buffer = XNEWVEC (char, listing_rhs_width);
+  data_buffer = XNEWVEC (char, MAX_BYTES);
   eject = 1;
   list = head->next;