aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2007-03-09 15:10:33 +0000
committerAlexandre Oliva <aoliva@gcc.gnu.org>2007-03-09 15:10:33 +0000
commit0de2ae02735c71f5318af4486444d33c26fc211a (patch)
tree5358725df8c01e01f2900a7a0802152c4430cf73
parent3d8864c06f474e854cdfd0dd0b238ee9f7b79fe3 (diff)
downloadgcc-0de2ae02735c71f5318af4486444d33c26fc211a.zip
gcc-0de2ae02735c71f5318af4486444d33c26fc211a.tar.gz
gcc-0de2ae02735c71f5318af4486444d33c26fc211a.tar.bz2
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
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/final.c2
-rw-r--r--gcc/rtl.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ffb5e3d..6aa8515 100644
--- 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
--- 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
--- 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