Remove stray conflict marker

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

diff --git a/gcc/xcoffout.h b/gcc/xcoffout.h
index ebf9413..12e4a74 100644 (file)
--- a/gcc/xcoffout.h
+++ b/gcc/xcoffout.h
@@ -2,25 +2,25 @@
    and xcoffout.h. 
    Copyright (C) 1998, 2000 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
-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.  */
 
 
-#define ASM_STABS_OP ".stabx"
+#define ASM_STABS_OP "\t.stabx\t"
 
 /* Tags and typedefs are C_DECL in XCOFF, not C_LSYM.  */
 
@@ -172,6 +172,15 @@ extern const char *xcoff_lastfile;
     }                                                  \
 }
 
+/* .stabx has the type in a different place.  */
+#if 0  /* Do not emit any marker for XCOFF until assembler allows XFT_CV.  */
+#define DBX_OUTPUT_GCC_MARKER(FILE) \
+  fprintf ((FILE), "%s\"%s\",0,%d,0\n", ASM_STABS_OP, STABS_GCC_MARKER, \
+          stab_to_sclass (N_GSYM))
+#else
+#define DBX_OUTPUT_GCC_MARKER(FILE)
+#endif
+
 /* Do not break .stabs pseudos into continuations.  */
 #define DBX_CONTIN_LENGTH 0
 
@@ -186,15 +195,16 @@ extern const char *xcoff_lastfile;
 
 #define DEBUG_SYMS_TEXT
 
-/* Prototype functions in xcoffout.c. */
+/* Prototype functions in xcoffout.c.  */
 
 extern int stab_to_sclass                      PARAMS ((int));
 #ifdef BUFSIZ
-extern void xcoffout_begin_function            PARAMS ((FILE *, int));
-extern void xcoffout_begin_block               PARAMS ((FILE *, int, int));
-extern void xcoffout_end_epilogue              PARAMS ((FILE *));
-extern void xcoffout_end_function              PARAMS ((FILE *, int));
-extern void xcoffout_end_block                 PARAMS ((FILE *, int, int));
+extern void xcoffout_begin_prologue            PARAMS ((unsigned int,
+                                                        const char *));
+extern void xcoffout_begin_block               PARAMS ((unsigned, unsigned));
+extern void xcoffout_end_epilogue              PARAMS ((void));
+extern void xcoffout_end_function              PARAMS ((unsigned int));
+extern void xcoffout_end_block                 PARAMS ((unsigned, unsigned));
 #endif /* BUFSIZ */
 
 #ifdef TREE_CODE
@@ -206,6 +216,7 @@ extern void xcoffout_declare_function               PARAMS ((FILE *, tree, const char *));
 
 #ifdef RTX_CODE
 #ifdef BUFSIZ
-extern void xcoffout_source_line               PARAMS ((FILE *, const char *, rtx));
+extern void xcoffout_source_line               PARAMS ((unsigned int,
+                                                        const char *));
 #endif /* BUFSIZ */
 #endif /* RTX_CODE */