gcc/

[pf3gnuchains/gcc-fork.git] / gcc / xcoffout.c

diff --git a/gcc/xcoffout.c b/gcc/xcoffout.c
index e706acc..f2b8a3f 100644 (file)
--- a/gcc/xcoffout.c
+++ b/gcc/xcoffout.c
@@ -1,24 +1,23 @@
 /* Output xcoff-format symbol table information from GNU compiler.
 /* Output xcoff-format symbol table information from GNU compiler.

-   Copyright (C) 1992, 1994, 1995, 1997, 1998,
-   1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1994, 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004
+   Free Software Foundation, Inc.

 
 

-This file is part of GNU CC.
+This file is part of GCC.

 
 

-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.

 
 

-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.

 
 You should have received a copy of the GNU General Public License
 
 You should have received a copy of the GNU General Public License

-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */

 
 /* Output xcoff-format symbol table data.  The main functionality is contained
    in dbxout.c.  This file implements the sdbout-like parts of the xcoff
 
 /* Output xcoff-format symbol table data.  The main functionality is contained
    in dbxout.c.  This file implements the sdbout-like parts of the xcoff


@@ -27,31 +26,23 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "system.h"
 
 #include "config.h"
 #include "system.h"

+#include "coretypes.h"
+#include "tm.h"

 #include "tree.h"
 #include "rtl.h"
 #include "flags.h"
 #include "toplev.h"
 #include "output.h"
 #include "ggc.h"
 #include "tree.h"
 #include "rtl.h"
 #include "flags.h"
 #include "toplev.h"
 #include "output.h"
 #include "ggc.h"

+#include "target.h"

 
 #ifdef XCOFF_DEBUGGING_INFO
 
 /* This defines the C_* storage classes.  */
 
 #ifdef XCOFF_DEBUGGING_INFO
 
 /* This defines the C_* storage classes.  */

-#include <dbxstclass.h>
-
+#include "xcoff.h"

 #include "xcoffout.h"
 #include "dbxout.h"
 #include "xcoffout.h"
 #include "dbxout.h"

-
-#if defined (USG) || !defined (HAVE_STAB_H)

 #include "gstab.h"
 #include "gstab.h"

-#else
-#include <stab.h>
-
-/* This is a GNU extension we need to reference in this file.  */
-#ifndef N_CATCH
-#define N_CATCH 0x54
-#endif
-#endif

 
 /* Line number of beginning of current function, minus one.
    Negative means not in a function or not using xcoff.  */
 
 /* Line number of beginning of current function, minus one.
    Negative means not in a function or not using xcoff.  */


@@ -86,12 +77,14 @@ const char *xcoff_lastfile;
 #define ABS_OR_RELATIVE_LINENO(LINENO)         \
 ((xcoff_inlining) ? (LINENO) : (LINENO) - xcoff_begin_function_line)
 
 #define ABS_OR_RELATIVE_LINENO(LINENO)         \
 ((xcoff_inlining) ? (LINENO) : (LINENO) - xcoff_begin_function_line)
 

-/* Output source line numbers via ".line" rather than ".stabd".  */
-#define ASM_OUTPUT_SOURCE_LINE(FILE,LINENUM) \
-  do {                                         \
-    if (xcoff_begin_function_line >= 0)                \
-      fprintf (FILE, "\t.line\t%d\n", ABS_OR_RELATIVE_LINENO (LINENUM)); \
-  } while (0)
+/* Output source line numbers via ".line".  */
+#define ASM_OUTPUT_LINE(FILE,LINENUM)                                     \
+  do                                                                      \
+    {                                                                     \
+      if (xcoff_begin_function_line >= 0)                                 \
+       fprintf (FILE, "\t.line\t%d\n", ABS_OR_RELATIVE_LINENO (LINENUM)); \
+    }                                                                     \
+  while (0)

 
 #define ASM_OUTPUT_LFB(FILE,LINENUM) \
 {                                              \
 
 #define ASM_OUTPUT_LFB(FILE,LINENUM) \
 {                                              \


@@ -105,11 +98,13 @@ const char *xcoff_lastfile;
        ? xcoff_current_include_file : main_input_filename); \
 }
 
        ? xcoff_current_include_file : main_input_filename); \
 }
 

-#define ASM_OUTPUT_LFE(FILE,LINENUM) \
-  do {                                         \
-    fprintf (FILE, "\t.ef\t%d\n", (LINENUM));  \
-    xcoff_begin_function_line = -1;            \
-  } while (0)
+#define ASM_OUTPUT_LFE(FILE,LINENUM)           \
+  do                                           \
+    {                                          \
+      fprintf (FILE, "\t.ef\t%d\n", (LINENUM));        \
+      xcoff_begin_function_line = -1;          \
+    }                                          \
+  while (0)

 
 #define ASM_OUTPUT_LBB(FILE,LINENUM,BLOCKNUM) \
   fprintf (FILE, "\t.bb\t%d\n", ABS_OR_RELATIVE_LINENO (LINENUM))
 
 #define ASM_OUTPUT_LBB(FILE,LINENUM,BLOCKNUM) \
   fprintf (FILE, "\t.bb\t%d\n", ABS_OR_RELATIVE_LINENO (LINENUM))


@@ -117,77 +112,84 @@ const char *xcoff_lastfile;
 #define ASM_OUTPUT_LBE(FILE,LINENUM,BLOCKNUM) \
   fprintf (FILE, "\t.eb\t%d\n", ABS_OR_RELATIVE_LINENO (LINENUM))
 
 #define ASM_OUTPUT_LBE(FILE,LINENUM,BLOCKNUM) \
   fprintf (FILE, "\t.eb\t%d\n", ABS_OR_RELATIVE_LINENO (LINENUM))
 

-static void assign_type_number         PARAMS ((tree, char *, int));
-static void xcoffout_block             PARAMS ((tree, int, tree));
+static void xcoffout_block (tree, int, tree);
+static void xcoffout_source_file (FILE *, const char *, int);

 \f
 /* Support routines for XCOFF debugging info.  */
 
 \f
 /* Support routines for XCOFF debugging info.  */
 

-/* Assign NUMBER as the stabx type number for the type described by NAME.
-   Search all decls in the list SYMS to find the type NAME.  */
-
-static void
-assign_type_number (syms, name, number)
-     tree syms;
-     char *name;
-     int number;
+struct xcoff_type_number

 {
 {

-  tree decl;
-
-  for (decl = syms; decl; decl = TREE_CHAIN (decl))
-    if (DECL_NAME (decl)
-       && strcmp (IDENTIFIER_POINTER (DECL_NAME (decl)), name) == 0)
-      {
-       TREE_ASM_WRITTEN (decl) = 1;
-       TYPE_SYMTAB_ADDRESS (TREE_TYPE (decl)) = number;
-      }
-}
-
-/* Setup gcc primitive types to use the XCOFF built-in type numbers where
-   possible.  */
-
-void
-xcoff_output_standard_types (syms)
-     tree syms;
-{
-  /* Handle built-in C types here.  */
-
-  assign_type_number (syms, "int", -1);
-  assign_type_number (syms, "char", -2);
-  assign_type_number (syms, "short int", -3);
-  assign_type_number (syms, "long int", (TARGET_64BIT ? -31 : -4));
-  assign_type_number (syms, "unsigned char", -5);
-  assign_type_number (syms, "signed char", -6);
-  assign_type_number (syms, "short unsigned int", -7);
-  assign_type_number (syms, "unsigned int", -8);
+  const char *name;
+  int number;
+};
+static const struct xcoff_type_number xcoff_type_numbers[] = {
+  { "int", -1 },
+  { "char", -2 },
+  { "short int", -3 },
+  { "long int", -4 },  /* fiddled to -31 if 64 bits */
+  { "unsigned char", -5 },
+  { "signed char", -6 },
+  { "short unsigned int", -7 },
+  { "unsigned int", -8 },

   /* No such type "unsigned".  */
   /* No such type "unsigned".  */

-  assign_type_number (syms, "long unsigned int", (TARGET_64BIT ? -32 : -10));
-  assign_type_number (syms, "void", -11);
-  assign_type_number (syms, "float", -12);
-  assign_type_number (syms, "double", -13);
-  assign_type_number (syms, "long double", -14);
+  { "long unsigned int", -10 }, /* fiddled to -32 if 64 bits */
+  { "void", -11 },
+  { "float", -12 },
+  { "double", -13 },
+  { "long double", -14 },

   /* Pascal and Fortran types run from -15 to -29.  */
   /* Pascal and Fortran types run from -15 to -29.  */

-  assign_type_number (syms, "wchar", -30);
-  assign_type_number (syms, "long long int", -31);
-  assign_type_number (syms, "long long unsigned int", -32);
+  { "wchar", -30 },  /* XXX Should be "wchar_t" ? */
+  { "long long int", -31 },
+  { "long long unsigned int", -32 },

   /* Additional Fortran types run from -33 to -37.  */
 
   /* ??? Should also handle built-in C++ and Obj-C types.  There perhaps
      aren't any that C doesn't already have.  */
   /* Additional Fortran types run from -33 to -37.  */
 
   /* ??? Should also handle built-in C++ and Obj-C types.  There perhaps
      aren't any that C doesn't already have.  */

+};    
+
+/* Returns an XCOFF fundamental type number for DECL (assumed to be a
+   TYPE_DECL), or 0 if dbxout.c should assign a type number normally.  */
+int
+xcoff_assign_fundamental_type_number (tree decl)
+{
+  const char *name;
+  size_t i;
+
+  /* Do not waste time searching the list for non-intrinsic types.  */
+  if (DECL_NAME (decl) == 0 || ! DECL_IS_BUILTIN (decl))
+    return 0;
+
+  name = IDENTIFIER_POINTER (DECL_NAME (decl));
+
+  /* Linear search, blech, but the list is too small to bother
+     doing anything else.  */
+  for (i = 0; i < ARRAY_SIZE (xcoff_type_numbers); i++)
+    if (!strcmp (xcoff_type_numbers[i].name, name))
+      goto found;
+  return 0;
+
+ found:
+  /* -4 and -10 should be replaced with -31 and -32, respectively,
+     when used for a 64-bit type.  */
+  if (int_size_in_bytes (TREE_TYPE (decl)) == 8)
+    {
+      if (xcoff_type_numbers[i].number == -4)
+       return -31;
+      if (xcoff_type_numbers[i].number == -10)
+       return -32;
+    }
+  return xcoff_type_numbers[i].number;

 }
 
 /* Print an error message for unrecognized stab codes.  */
 
 #define UNKNOWN_STAB(STR)      \
 }
 
 /* Print an error message for unrecognized stab codes.  */
 
 #define UNKNOWN_STAB(STR)      \

-   do { \
-     error ("Unknown stab %s: : 0x%x\n", STR, stab);   \
-     fflush (stderr);  \
-   } while (0)
+  internal_error ("no sclass for %s stab (0x%x)\n", STR, stab)

 
 /* Conversion routine from BSD stabs to AIX storage classes.  */
 
 int
 
 /* Conversion routine from BSD stabs to AIX storage classes.  */
 
 int

-stab_to_sclass (stab)
-     int stab;
+stab_to_sclass (int stab)

 {
   switch (stab)
     {
 {
   switch (stab)
     {


@@ -195,8 +197,7 @@ stab_to_sclass (stab)
       return C_GSYM;
 
     case N_FNAME:
       return C_GSYM;
 
     case N_FNAME:

-      UNKNOWN_STAB ("N_FNAME"); 
-      abort();
+      UNKNOWN_STAB ("N_FNAME");

 
     case N_FUN:
       return C_FUN;
 
     case N_FUN:
       return C_FUN;


@@ -205,18 +206,14 @@ stab_to_sclass (stab)
     case N_LCSYM:
       return C_STSYM;
 
     case N_LCSYM:
       return C_STSYM;
 

-#ifdef N_MAIN

     case N_MAIN:
     case N_MAIN:

-      UNKNOWN_STAB ("N_MAIN"); 
-      abort ();
-#endif
+      UNKNOWN_STAB ("N_MAIN");

 
     case N_RSYM:
       return C_RSYM;
 
     case N_SSYM:
 
     case N_RSYM:
       return C_RSYM;
 
     case N_SSYM:

-      UNKNOWN_STAB ("N_SSYM"); 
-      abort ();
+      UNKNOWN_STAB ("N_SSYM");

 
     case N_RPSYM:
       return C_RPSYM;
 
     case N_RPSYM:
       return C_RPSYM;


@@ -231,60 +228,34 @@ stab_to_sclass (stab)
       return C_ENTRY;
 
     case N_SO:
       return C_ENTRY;
 
     case N_SO:

-      UNKNOWN_STAB ("N_SO"); 
-      abort ();
+      UNKNOWN_STAB ("N_SO");

 
     case N_SOL:
 
     case N_SOL:

-      UNKNOWN_STAB ("N_SOL"); 
-      abort ();
+      UNKNOWN_STAB ("N_SOL");

 
     case N_SLINE:
 
     case N_SLINE:

-      UNKNOWN_STAB ("N_SLINE"); 
-      abort ();
+      UNKNOWN_STAB ("N_SLINE");

 
 

-#ifdef N_DSLINE

     case N_DSLINE:
     case N_DSLINE:

-      UNKNOWN_STAB ("N_DSLINE"); 
-      abort ();
-#endif
+      UNKNOWN_STAB ("N_DSLINE");

 
 

-#ifdef N_BSLINE

     case N_BSLINE:
     case N_BSLINE:

-      UNKNOWN_STAB ("N_BSLINE"); 
-      abort ();
-#endif
-#if 0
-      /* This has the same value as N_BSLINE.  */
-    case N_BROWS:
-      UNKNOWN_STAB ("N_BROWS"); 
-      abort ();
-#endif
-
-#ifdef N_BINCL
+      UNKNOWN_STAB ("N_BSLINE");
+

     case N_BINCL:
     case N_BINCL:

-      UNKNOWN_STAB ("N_BINCL"); 
-      abort ();
-#endif
+      UNKNOWN_STAB ("N_BINCL");

 
 

-#ifdef N_EINCL

     case N_EINCL:
     case N_EINCL:

-      UNKNOWN_STAB ("N_EINCL"); 
-      abort ();
-#endif
+      UNKNOWN_STAB ("N_EINCL");

 
 

-#ifdef N_EXCL

     case N_EXCL:
     case N_EXCL:

-      UNKNOWN_STAB ("N_EXCL"); 
-      abort ();
-#endif
+      UNKNOWN_STAB ("N_EXCL");

 
     case N_LBRAC:
 
     case N_LBRAC:

-      UNKNOWN_STAB ("N_LBRAC"); 
-      abort ();
+      UNKNOWN_STAB ("N_LBRAC");

 
     case N_RBRAC:
 
     case N_RBRAC:

-      UNKNOWN_STAB ("N_RBRAC"); 
-      abort ();
+      UNKNOWN_STAB ("N_RBRAC");

 
     case N_BCOMM:
       return C_BCOMM;
 
     case N_BCOMM:
       return C_BCOMM;


@@ -294,43 +265,33 @@ stab_to_sclass (stab)
       return C_ECOML;
 
     case N_LENG:
       return C_ECOML;
 
     case N_LENG:

-      UNKNOWN_STAB ("N_LENG"); 
-      abort ();
+      UNKNOWN_STAB ("N_LENG");

 
     case N_PC:
 
     case N_PC:

-      UNKNOWN_STAB ("N_PC"); 
-      abort ();
+      UNKNOWN_STAB ("N_PC");

 
 

-#ifdef N_M2C

     case N_M2C:
     case N_M2C:

-      UNKNOWN_STAB ("N_M2C"); 
-      abort ();
-#endif
+      UNKNOWN_STAB ("N_M2C");

 
 

-#ifdef N_SCOPE

     case N_SCOPE:
     case N_SCOPE:

-      UNKNOWN_STAB ("N_SCOPE"); 
-      abort ();
-#endif
+      UNKNOWN_STAB ("N_SCOPE");

 
     case N_CATCH:
 
     case N_CATCH:

-      UNKNOWN_STAB ("N_CATCH"); 
-      abort ();
+      UNKNOWN_STAB ("N_CATCH");
+
+    case N_OPT:
+      UNKNOWN_STAB ("N_OPT");

 
     default:
 
     default:

-      UNKNOWN_STAB ("default"); 
-      abort ();
-  }
+      UNKNOWN_STAB ("?");
+    }

 }
 \f
 /* Output debugging info to FILE to switch to sourcefile FILENAME.
    INLINE_P is true if this is from an inlined function.  */
 
 }
 \f
 /* Output debugging info to FILE to switch to sourcefile FILENAME.
    INLINE_P is true if this is from an inlined function.  */
 

-void
-xcoffout_source_file (file, filename, inline_p)
-     FILE *file;
-     const char *filename;
-     int inline_p;
+static void
+xcoffout_source_file (FILE *file, const char *filename, int inline_p)

 {
   if (filename
       && (xcoff_lastfile == 0 || strcmp (filename, xcoff_lastfile)
 {
   if (filename
       && (xcoff_lastfile == 0 || strcmp (filename, xcoff_lastfile)


@@ -344,7 +305,7 @@ xcoffout_source_file (file, filename, inline_p)
          fprintf (file, "\n");
          xcoff_current_include_file = NULL;
        }
          fprintf (file, "\n");
          xcoff_current_include_file = NULL;
        }

-       xcoff_inlining=inline_p;
+      xcoff_inlining = inline_p;

       if (strcmp (main_input_filename, filename) || inline_p)
        {
          fprintf (file, "\t.bi\t");
       if (strcmp (main_input_filename, filename) || inline_p)
        {
          fprintf (file, "\t.bi\t");


@@ -352,26 +313,21 @@ xcoffout_source_file (file, filename, inline_p)
          fprintf (file, "\n");
          xcoff_current_include_file = filename;
        }
          fprintf (file, "\n");
          xcoff_current_include_file = filename;
        }

-      
-      if (!xcoff_lastfile)
-       ggc_add_string_root ((char **) &xcoff_lastfile, 1);
-

       xcoff_lastfile = filename;
     }
 }
 
       xcoff_lastfile = filename;
     }
 }
 

-/* Output a line number symbol entry into output stream FILE,
-   for source file FILENAME and line number NOTE.  */
+/* Output a line number symbol entry for location (FILENAME, LINE).  */

 
 void
 
 void

-xcoffout_source_line (file, filename, note)
-     FILE *file;
-     const char *filename;
-     rtx note;
+xcoffout_source_line (unsigned int line, const char *filename)

 {
 {

-  xcoffout_source_file (file, filename, RTX_INTEGRATED_P (note));
+  bool inline_p = (strcmp (xcoff_current_function_file, filename) != 0
+                  || (int) line < xcoff_begin_function_line);
+
+  xcoffout_source_file (asm_out_file, filename, inline_p);

 
 

-  ASM_OUTPUT_SOURCE_LINE (file, NOTE_LINE_NUMBER (note));
+  ASM_OUTPUT_LINE (asm_out_file, line);

 }
 \f
 /* Output the symbols defined in block number DO_BLOCK.
 }
 \f
 /* Output the symbols defined in block number DO_BLOCK.


@@ -382,10 +338,7 @@ xcoffout_source_line (file, filename, note)
 static int do_block = 0;
 
 static void
 static int do_block = 0;
 
 static void

-xcoffout_block (block, depth, args)
-     register tree block;
-     int depth;
-     tree args;
+xcoffout_block (tree block, int depth, tree args)

 {
   while (block)
     {
 {
   while (block)
     {


@@ -424,18 +377,14 @@ xcoffout_block (block, depth, args)
    if the count starts at 0 for the outermost one.  */
 
 void
    if the count starts at 0 for the outermost one.  */
 
 void

-xcoffout_begin_block (file, line, n)
-     FILE *file;
-     int line;
-     int n;
+xcoffout_begin_block (unsigned int line, unsigned int n)

 {
   tree decl = current_function_decl;
 
 {
   tree decl = current_function_decl;
 

-  

   /* The IBM AIX compiler does not emit a .bb for the function level scope,
      so we avoid it here also.  */
   if (n != 1)
   /* The IBM AIX compiler does not emit a .bb for the function level scope,
      so we avoid it here also.  */
   if (n != 1)

-    ASM_OUTPUT_LBB (file, line, n);
+    ASM_OUTPUT_LBB (asm_out_file, line, n);

 
   do_block = n;
   xcoffout_block (DECL_INITIAL (decl), 0, DECL_ARGUMENTS (decl));
 
   do_block = n;
   xcoffout_block (DECL_INITIAL (decl), 0, DECL_ARGUMENTS (decl));


@@ -444,40 +393,30 @@ xcoffout_begin_block (file, line, n)
 /* Describe the end line-number of an internal block within a function.  */
 
 void
 /* Describe the end line-number of an internal block within a function.  */
 
 void

-xcoffout_end_block (file, line, n)
-     FILE *file;
-     int line;
-     int n;
+xcoffout_end_block (unsigned int line, unsigned int n)

 {
   if (n != 1)
 {
   if (n != 1)

-    ASM_OUTPUT_LBE (file, line, n);
+    ASM_OUTPUT_LBE (asm_out_file, line, n);

 }
 
 /* Called at beginning of function (before prologue).
    Declare function as needed for debugging.  */
 
 void
 }
 
 /* Called at beginning of function (before prologue).
    Declare function as needed for debugging.  */
 
 void

-xcoffout_declare_function (file, decl, name)
-     FILE *file;
-     tree decl;
-     const char *name;
+xcoffout_declare_function (FILE *file, tree decl, const char *name)

 {
 {

-  char *n = (char *) name;
-  int i;
-
-  if (*n == '*')
-    n++;
-  else
-    for (i = 0; name[i]; ++i)
-      {
-       if (name[i] == '[')
-         {
-           n = (char *) alloca (i + 1);
-           strncpy (n, name, i);
-           n[i] = '\0';
-           break;
-         }
-      }
+  size_t len;
+
+  if (*name == '*')
+    name++;
+  len = strlen (name);
+  if (name[len - 1] == ']')
+    {
+      char *n = alloca (len - 3);
+      memcpy (n, name, len - 4);
+      n[len - 4] = '\0';
+      name = n;
+    }

 
   /* Any pending .bi or .ei must occur before the .function pseudo op.
      Otherwise debuggers will think that the function is in the previous
 
   /* Any pending .bi or .ei must occur before the .function pseudo op.
      Otherwise debuggers will think that the function is in the previous


@@ -487,20 +426,20 @@ xcoffout_declare_function (file, decl, name)
 
   /* .function NAME, TOP, MAPPING, TYPE, SIZE
      16 and 044 are placeholders for backwards compatibility */
 
   /* .function NAME, TOP, MAPPING, TYPE, SIZE
      16 and 044 are placeholders for backwards compatibility */

-  fprintf (file, "\t.function .%s,.%s,16,044,FE..%s-.%s\n", n, n, n, n);
+  fprintf (file, "\t.function .%s,.%s,16,044,FE..%s-.%s\n",
+          name, name, name, name);

 }
 
 }
 

-/* Called at beginning of function body (after prologue).
+/* Called at beginning of function body (at start of prologue).

    Record the function's starting line number, so we can output
    relative line numbers for the other lines.
    Record the file name that this function is contained in.  */
 
 void
    Record the function's starting line number, so we can output
    relative line numbers for the other lines.
    Record the file name that this function is contained in.  */
 
 void

-xcoffout_begin_function (file, last_linenum)
-     FILE *file;
-     int last_linenum;
+xcoffout_begin_prologue (unsigned int line,
+                        const char *file ATTRIBUTE_UNUSED)

 {
 {

-  ASM_OUTPUT_LFB (file, last_linenum);
+  ASM_OUTPUT_LFB (asm_out_file, line);

   dbxout_parms (DECL_ARGUMENTS (current_function_decl));
 
   /* Emit the symbols for the outermost BLOCK's variables.  sdbout.c does this
   dbxout_parms (DECL_ARGUMENTS (current_function_decl));
 
   /* Emit the symbols for the outermost BLOCK's variables.  sdbout.c does this


@@ -511,26 +450,24 @@ xcoffout_begin_function (file, last_linenum)
   xcoffout_block (DECL_INITIAL (current_function_decl), 0,
                  DECL_ARGUMENTS (current_function_decl));
 
   xcoffout_block (DECL_INITIAL (current_function_decl), 0,
                  DECL_ARGUMENTS (current_function_decl));
 

-  ASM_OUTPUT_SOURCE_LINE (file, last_linenum);
+  ASM_OUTPUT_LINE (asm_out_file, line);

 }
 
 /* Called at end of function (before epilogue).
    Describe end of outermost block.  */
 
 void
 }
 
 /* Called at end of function (before epilogue).
    Describe end of outermost block.  */
 
 void

-xcoffout_end_function (file, last_linenum)
-     FILE *file;
-     int last_linenum;
+xcoffout_end_function (unsigned int last_linenum)

 {
 {

-  ASM_OUTPUT_LFE (file, last_linenum);
+  ASM_OUTPUT_LFE (asm_out_file, last_linenum);

 }
 
 /* Output xcoff info for the absolute end of a function.
    Called after the epilogue is output.  */
 
 void
 }
 
 /* Output xcoff info for the absolute end of a function.
    Called after the epilogue is output.  */
 
 void

-xcoffout_end_epilogue (file)
-     FILE *file;
+xcoffout_end_epilogue (unsigned int line ATTRIBUTE_UNUSED,
+                      const char *file ATTRIBUTE_UNUSED)

 {
   /* We need to pass the correct function size to .function, otherwise,
      the xas assembler can't figure out the correct size for the function
 {
   /* We need to pass the correct function size to .function, otherwise,
      the xas assembler can't figure out the correct size for the function


@@ -540,7 +477,7 @@ xcoffout_end_epilogue (file)
   const char *fname = XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0);
   if (*fname == '*')
     ++fname;
   const char *fname = XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0);
   if (*fname == '*')
     ++fname;

-  fprintf (file, "FE..");
-  ASM_OUTPUT_LABEL (file, fname);
+  fprintf (asm_out_file, "FE..");
+  ASM_OUTPUT_LABEL (asm_out_file, fname);

 }
 #endif /* XCOFF_DEBUGGING_INFO */
 }
 #endif /* XCOFF_DEBUGGING_INFO */