Merge basic-improvements-branch to trunk

[thirdparty/gcc.git] / gcc / xcoffout.c

diff --git a/gcc/xcoffout.c b/gcc/xcoffout.c
index 75a8a8d80a04458366410131f1f0233617d86354..c34096bd382a9ace2c3757cd1288defb06b285ab 100644 (file)
--- a/gcc/xcoffout.c
+++ b/gcc/xcoffout.c
@@ -1,5 +1,5 @@
 /* Output xcoff-format symbol table information from GNU compiler.
-   Copyright (C) 1992, 1994, 1995, 1997, 1998, 1999, 2000
+   Copyright (C) 1992, 1994, 1995, 1997, 1998, 1999, 2000, 2002
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -26,12 +26,15 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #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 "target.h"
 
 #ifdef XCOFF_DEBUGGING_INFO
 
@@ -75,11 +78,13 @@ const char *xcoff_lastfile;
 ((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)
+#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)
 
 #define ASM_OUTPUT_LFB(FILE,LINENUM) \
 {                                              \
@@ -93,11 +98,13 @@ const char *xcoff_lastfile;
        ? 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))
@@ -167,7 +174,7 @@ xcoff_output_standard_types (syms)
 /* Print an error message for unrecognized stab codes.  */
 
 #define UNKNOWN_STAB(STR)      \
-  internal_error ("No sclass for %s stab (0x%x)\n", STR, stab)
+  internal_error ("no sclass for %s stab (0x%x)\n", STR, stab)
 
 /* Conversion routine from BSD stabs to AIX storage classes.  */
 
@@ -328,7 +335,7 @@ static int do_block = 0;
 
 static void
 xcoffout_block (block, depth, args)
-     register tree block;
+     tree block;
      int depth;
      tree args;
 {
@@ -471,7 +478,9 @@ xcoffout_end_function (last_linenum)
    Called after the epilogue is output.  */
 
 void
-xcoffout_end_epilogue ()
+xcoffout_end_epilogue (line, file)
+     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