(DBX_STATIC_BLOCK_END): Use macro arguments.

(xcoff_begin_function_line, xcoff_current_function_file): Remove
unused extern declarations.
(DBX_OUTPUT_MAIN_SOURCE_FILENAME): Use macro argument.

From-SVN: r10731

gcc/xcoffout.h

@@ -58,8 +58,8 @@
 
 #define DBX_STATIC_BLOCK_END(ASMFILE,CODE)				\
 {									\
-  if (current_sym_code == N_STSYM || current_sym_code == N_LCSYM)	\
-    fprintf (asmfile, "\t.es\n");					\
+  if ((CODE) == N_STSYM || (CODE) == N_LCSYM)				\
+    fputs ("\t.es\n", (ASMFILE));					\
 }
 
 /* We must use N_RPYSM instead of N_RSYM for register parameters.  */
@@ -115,22 +115,10 @@
 #define N_RPSYM 0x8e
 #endif
 
-/* The line number of the beginning of the current function.
-   xcoffout.c needs this so that it can output relative linenumbers.  */
-
-extern int xcoff_begin_function_line;
-
 /* Name of the current include file.  */
 
 extern char *xcoff_current_include_file;
 
-/* Name of the current function file.  This is the file the `.bf' is
-   emitted from.  In case a line is emitted from a different file,
-   (by including that file of course), then the line number will be
-   absolute.  */
-
-extern char *xcoff_current_function_file;
-
 /* Names of bss and data sections.  These should be unique names for each
    compilation unit.  */
 
@@ -151,16 +139,16 @@ extern char *xcoff_lastfile;
    is already emitting a .file directory, so we don't output one here also.
    Initialize xcoff_lastfile.  */
 #define DBX_OUTPUT_MAIN_SOURCE_FILENAME(FILE,FILENAME) \
-  xcoff_lastfile = input_file_name
+  xcoff_lastfile = (FILENAME)
 
 /* If we are still in an include file, its end must be marked.  */
 #define DBX_OUTPUT_MAIN_SOURCE_FILE_END(FILE, FILENAME)	\
 {							\
   if (xcoff_current_include_file)			\
     {							\
-      fprintf (FILE, "\t.ei\t");			\
-      output_quoted_string (FILE, xcoff_current_include_file);	\
-      fprintf (FILE, "\n");				\
+      fputs ("\t.ei\t", (FILE));			\
+      output_quoted_string ((FILE), xcoff_current_include_file);	\
+      putc ('\n', (FILE));				\
       xcoff_current_include_file = NULL;		\
     }							\
 }