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 18c6e3ba3aea92564391a57aa63fc6251ab47430..31eae98ae498dfa5054428e6ee5c07d9cd6c991b 100644 (file)
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -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