gas: Record file name in macro locations

This allows the correct file name to be used when emitting messages for
lines within a macro.  The line numbers were already set and displayed
correctly, which resulted in mismatched file names and line numbers.

PR 32738

diff --git a/gas/macro.c b/gas/macro.c
index 20309d4d68f0958839f07a85b83f47d5624750ef..13202d3f58a5e21913e47b2a5be521f92a84086d 100644 (file)
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -112,11 +112,13 @@ buffer_and_nest (const char *from, const char *to, sb *ptr,
     unsigned int line;
     char *linefile;
 
-    as_where_top (&line);
-    if (!flag_m68k_mri)
-      linefile = xasprintf ("\t.linefile %u .", line + 1);
+    const char *prefix = flag_m68k_mri ? "" : ".";
+    const char *file = as_where_top (&line);
+
+    if (file)
+      linefile = xasprintf ("\t%slinefile %u \"%s\"", prefix, line + 1, file);
     else
-      linefile = xasprintf ("\tlinefile %u .", line + 1);
+      linefile = xasprintf ("\t%slinefile %u .", prefix, line + 1);
     sb_add_string (ptr, linefile);
     xfree (linefile);
   }

diff --git a/gas/testsuite/gas/elf/line.l b/gas/testsuite/gas/elf/line.l
index 37384d7d92324093af6de8e827f51072c7b073c4..f2bc9ef76c76e34413fa1f828daa992ea36eb207 100644 (file)
--- a/gas/testsuite/gas/elf/line.l
+++ b/gas/testsuite/gas/elf/line.l
@@ -2,17 +2,17 @@
 
 .*: Assembler messages:
 line\.s:[0-9]*18: Warning: \.warning .*
-line\.s:2: Warning: m1/1: 123
+.*line\.s:2: Warning: m1/1: 123
 line\.s:[0-9]*21:  Info: .*
-line\.s:4: Warning: m1/2: 123
+.*line\.s:4: Warning: m1/2: 123
 line\.s:[0-9]*21:  Info: .*
-line\.s:2: Warning: m1/1: abc
+.*line\.s:2: Warning: m1/1: abc
 line\.s:[0-9]*22:  Info: .*
-line\.s:4: Warning: m1/2: abc
+.*line\.s:4: Warning: m1/2: abc
 line\.s:[0-9]*22:  Info: .*
-line\.s:2: Warning: m1/1: XYZ
+.*line\.s:2: Warning: m1/1: XYZ
 line\.s:[0-9]*23:  Info: .*
-line\.s:4: Warning: m1/2: XYZ
+.*line\.s:4: Warning: m1/2: XYZ
 line\.s:[0-9]*23:  Info: .*
 line\.s:[0-9]*24: Warning: \.warning .*
 Line2\.s:10: Warning: m2/1: 987

diff --git a/gas/testsuite/gas/elf/line2.l b/gas/testsuite/gas/elf/line2.l
index d98b74b767fb747df0db5b6992cc603fda880a52..92627fe3a5405f06e0e57bb1d6e1af0b2cd43f43 100644 (file)
--- a/gas/testsuite/gas/elf/line2.l
+++ b/gas/testsuite/gas/elf/line2.l
@@ -1,5 +1,5 @@
 .*line2\.s: Assembler messages:
 .*line2\.inc:2: Warning: inside macro
 .*line2\.inc:6:  Info: macro invoked from here
-.*:2: Warning: inside macro
+.*line2\.inc:2: Warning: inside macro
 .*line2\.s:3:  Info: macro invoked from here