rtl.h (gen_rtx_ASM_INPUT): Use "" instead of NULL file name.

* rtl.h (gen_rtx_ASM_INPUT): Use "" instead of NULL file name.
* final.c (final_scan_insn): Test for non-"" file name.

From-SVN: r122750

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ffb5e3d..6aa8515 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-09  Alexandre Oliva  <aoliva@redhat.com>
+
+       * rtl.h (gen_rtx_ASM_INPUT): Use "" instead of NULL file name.
+       * final.c (final_scan_insn): Test for non-"" file name.
+
 2007-03-09  Sebastian Pop  <sebastian.pop@inria.fr>
 
        * doc/loop.texi: Document the Omega linear constraints solver.

diff --git a/gcc/final.c b/gcc/final.c
index d7d1daf..5715a71 100644 (file)
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -2081,7 +2081,7 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED,
                loc.file = ASM_INPUT_SOURCE_FILE (body);
                loc.line = ASM_INPUT_SOURCE_LINE (body);
 #endif
-               if (loc.file && loc.line)
+               if (*loc.file && loc.line)
                  fprintf (asm_out_file, "%s %i \"%s\" 1\n",
                           ASM_COMMENT_START, loc.line, loc.file);
                fprintf (asm_out_file, "\t%s\n", string);

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 5c39efe..5b0f8f4 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1875,7 +1875,7 @@ extern GTY(()) rtx return_address_pointer_rtx;
   gen_rtx_fmt_si (ASM_INPUT, (MODE), (ARG0), (LOC))
 #else
 #define gen_rtx_ASM_INPUT(MODE, ARG0)                          \
-  gen_rtx_fmt_ssi (ASM_INPUT, (MODE), (ARG0), NULL, 0)
+  gen_rtx_fmt_ssi (ASM_INPUT, (MODE), (ARG0), "", 0)
 #define gen_rtx_ASM_INPUT_loc(MODE, ARG0, LOC)                 \
   gen_rtx_fmt_ssi (ASM_INPUT, (MODE), (ARG0), (LOC).file, (LOC).line)
 #undef gen_rtx_ASM_OPERANDS