From: Kazu Hirata <kazu@cs.umass.edu>
Date: Mon, 5 Jan 2004 22:08:26 +0000 (+0000)
Subject: system.h (ASM_OUTPUT_MAIN_SOURCE_FILENAME): Poison.
X-Git-Tag: releases/gcc-3.4.0~1259
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7e7e3187576258c26b3d780f4b93b4e9ca516d7;p=thirdparty%2Fgcc.git

system.h (ASM_OUTPUT_MAIN_SOURCE_FILENAME): Poison.

	* system.h (ASM_OUTPUT_MAIN_SOURCE_FILENAME): Poison.
	* toplev.c (output_file_directive): Don't use
	ASM_OUTPUT_MAIN_SOURCE_FILENAME.

From-SVN: r75448
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 09d6b9b921bc..1b009407e33d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-05  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* system.h (ASM_OUTPUT_MAIN_SOURCE_FILENAME): Poison.
+	* toplev.c (output_file_directive): Don't use
+	ASM_OUTPUT_MAIN_SOURCE_FILENAME.
+
 2004-01-05  Daniel Berlin  <dberlin@dberlin.org>
 	
 	* ggc-zone.c: Remove everything in #ifdef USING_MALLOC_PAGE_GROUPS
diff --git a/gcc/system.h b/gcc/system.h
index 2bd908749b7c..c6003d61b401 100644
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -621,7 +621,7 @@ typedef char _Bool;
 	EXIT_BODY OBJECT_FORMAT_ROSE MULTIBYTE_CHARS MAP_CHARACTER	   \
 	LIBGCC_NEEDS_DOUBLE FINAL_PRESCAN_LABEL DEFAULT_CALLER_SAVES	   \
 	LOAD_ARGS_REVERSED MAX_INTEGER_COMPUTATION_MODE			   \
-	CONVERT_HARD_REGISTER_TO_SSA_P
+	CONVERT_HARD_REGISTER_TO_SSA_P ASM_OUTPUT_MAIN_SOURCE_FILENAME
 
 /* Hooks that are no longer used.  */
  #pragma GCC poison LANG_HOOKS_FUNCTION_MARK LANG_HOOKS_FUNCTION_FREE	\
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 650eafc75362..6c4970a109de 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1425,9 +1425,6 @@ output_file_directive (FILE *asm_file, const char *input_name)
       na--;
     }
 
-#ifdef ASM_OUTPUT_MAIN_SOURCE_FILENAME
-  ASM_OUTPUT_MAIN_SOURCE_FILENAME (asm_file, na);
-#else
 #ifdef ASM_OUTPUT_SOURCE_FILENAME
   ASM_OUTPUT_SOURCE_FILENAME (asm_file, na);
 #else
@@ -1435,7 +1432,6 @@ output_file_directive (FILE *asm_file, const char *input_name)
   output_quoted_string (asm_file, na);
   fputc ('\n', asm_file);
 #endif
-#endif
 }
 
 /* Routine to open a dump file.  Return true if the dump file is enabled.  */