From: Alexandre Oliva <aoliva@redhat.com>
Date: Fri, 9 Mar 2007 15:10:33 +0000 (+0000)
Subject: rtl.h (gen_rtx_ASM_INPUT): Use "" instead of NULL file name.
X-Git-Tag: releases/gcc-4.3.0~6347
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0de2ae02735c71f5318af4486444d33c26fc211a;p=thirdparty%2Fgcc.git

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 ffb5e3d38c18..6aa85152ee06 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 d7d1dafe2a4b..5715a71a6489 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 5c39efeecf06..5b0f8f48d275 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