mmix.h (ASM_OUTPUT_SOURCE_FILENAME): Remove macro.

	* config/mmix/mmix.h (ASM_OUTPUT_SOURCE_FILENAME): Remove macro.
	* config/mmix/mmix-protos.h (mmix_asm_output_source_filename): Remove.
	* config/mmix/mmix.c (mmix_asm_output_source_filename): Make static.
	(TARGET_ASM_OUTPUT_SOURCE_FILENAME): Define.

From-SVN: r162793

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 356f52923f11833354c1907073663371f6db390b..e5fc835aad8ad001b82a239e7adf614795a821ff 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-01  Anatoly Sokolov  <aesok@post.ru>
+
+       * config/mmix/mmix.h (ASM_OUTPUT_SOURCE_FILENAME): Remove macro.
+       * config/mmix/mmix-protos.h (mmix_asm_output_source_filename): Remove.
+       * config/mmix/mmix.c (mmix_asm_output_source_filename): Make static.
+       (TARGET_ASM_OUTPUT_SOURCE_FILENAME): Define.
+
 2010-07-31  Kai Tietz  <kai.tietz@onevision.com>
 
        * cppdefault.c (cpp_include_defaults): Move GCC_INCLUDE_DIR before

diff --git a/gcc/config/mmix/mmix-protos.h b/gcc/config/mmix/mmix-protos.h
index 18d21f1650eb9282a93586d5b44520905b164dbd..9918fa8094d07a2d745d36a21424ce7b2da0ea7c 100644 (file)
--- a/gcc/config/mmix/mmix-protos.h
+++ b/gcc/config/mmix/mmix-protos.h
@@ -31,7 +31,6 @@ extern int mmix_register_move_cost
   (enum machine_mode, enum reg_class, enum reg_class);
 extern const char *mmix_text_section_asm_op (void);
 extern const char *mmix_data_section_asm_op (void);
-extern void mmix_asm_output_source_filename (FILE *, const char *);
 extern void mmix_output_quoted_string (FILE *, const char *, int);
 extern void mmix_asm_output_source_line  (FILE *, int);
 extern void mmix_asm_output_ascii (FILE *, const char *, int);

diff --git a/gcc/config/mmix/mmix.c b/gcc/config/mmix/mmix.c
index 24fa24d9d0381fd75accfaeedf61823cc8d2192b..8ed8b177fcb61f1313548f077e621dc84dd85df8 100644 (file)
--- a/gcc/config/mmix/mmix.c
+++ b/gcc/config/mmix/mmix.c
@@ -113,6 +113,7 @@ rtx mmix_compare_op1;
 /* Intermediate for insn output.  */
 static int mmix_output_destination_register;
 
+static void mmix_asm_output_source_filename (FILE *, const char *);
 static void mmix_output_shiftvalue_op_from_str
   (FILE *, const char *, HOST_WIDEST_INT);
 static void mmix_output_shifted_value (FILE *, HOST_WIDEST_INT);
@@ -189,6 +190,8 @@ static void mmix_trampoline_init (rtx, tree, rtx);
 #define TARGET_ASM_FILE_START_FILE_DIRECTIVE true
 #undef TARGET_ASM_FILE_END
 #define TARGET_ASM_FILE_END mmix_file_end
+#undef TARGET_ASM_OUTPUT_SOURCE_FILENAME
+#define TARGET_ASM_OUTPUT_SOURCE_FILENAME mmix_asm_output_source_filename
 
 #undef TARGET_RTX_COSTS
 #define TARGET_RTX_COSTS mmix_rtx_costs
@@ -1245,9 +1248,9 @@ mmix_file_end (void)
   switch_to_section (data_section);
 }
 
-/* ASM_OUTPUT_SOURCE_FILENAME.  */
+/* TARGET_ASM_OUTPUT_SOURCE_FILENAME.  */
 
-void
+static void
 mmix_asm_output_source_filename (FILE *stream, const char *name)
 {
   fprintf (stream, "# 1 ");

diff --git a/gcc/config/mmix/mmix.h b/gcc/config/mmix/mmix.h
index 48551028d5bbf8d024b7379ea5ddc08590fd4f2b..26447357e4711ff0c086a86bd8b504d3e49526bf 100644 (file)
--- a/gcc/config/mmix/mmix.h
+++ b/gcc/config/mmix/mmix.h
@@ -726,9 +726,6 @@ typedef struct { int regs; int lib; } CUMULATIVE_ARGS;
 #define ASM_APP_ON "%APP\n"
 #define ASM_APP_OFF "%NO_APP\n"
 
-#define ASM_OUTPUT_SOURCE_FILENAME(STREAM, NAME) \
- mmix_asm_output_source_filename (STREAM, NAME)
-
 #define OUTPUT_QUOTED_STRING(STREAM, STRING) \
  mmix_output_quoted_string (STREAM, STRING, strlen (STRING))