* system.h (ASM_OUTPUT_MAIN_SOURCE_FILENAME): Poison.

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75448 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 09d6b9b..1b00940 100644 (file)
--- 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 2bd9087..c6003d6 100644 (file)
--- 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 650eafc..6c4970a 100644 (file)
--- 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.  */