(USER_LABEL_PREFIX): Redefine, not ASM_OUTPUT_LABELREF.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@12752 138bc75d-0d04-0410-961f-82ee72b054a4

13 files changed, 65 insertions, 70 deletions

diff --git a/gcc/config/i386/att.h b/gcc/config/i386/att.h
index ef095b7a67f..e5c2d9c7e99 100644
--- a/gcc/config/i386/att.h
+++ b/gcc/config/i386/att.h
@@ -87,9 +87,7 @@ do								\
 #define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM)	\
   fprintf (FILE, ".%s%d:\n", PREFIX, NUM)
 
-/* This is how to output a reference to a user-level label named NAME.  */
-
-#undef ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME)	\
-  fprintf (FILE, "%s", NAME)
+/* The prefix to add to user-visible assembler symbols. */
 
+#undef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
diff --git a/gcc/config/i386/bsd.h b/gcc/config/i386/bsd.h
index 6bf7399dc31..d50be3664c1 100644
--- a/gcc/config/i386/bsd.h
+++ b/gcc/config/i386/bsd.h
@@ -1,7 +1,7 @@
 /* Definitions for BSD assembler syntax for Intel 386
    (actually AT&T syntax for insns and operands,
    adapted to BSD conventions for symbol names and debugging.)
-   Copyright (C) 1988 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -115,12 +115,12 @@ Boston, MA 02111-1307, USA.  */
   fprintf (FILE, "%s%d:\n", PREFIX, NUM)
 #endif
 
-/* This is how to output a reference to a user-level label named NAME.  */
+/* The prefix to add to user-visible assembler symbols. */
 
 #ifdef NO_UNDERSCORES
-#define ASM_OUTPUT_LABELREF(FILE,NAME) fprintf (FILE, "%s", NAME)
+#define USER_LABEL_PREFIX ""
 #else
-#define ASM_OUTPUT_LABELREF(FILE,NAME) fprintf (FILE, "_%s", NAME)
+#define USER_LABEL_PREFIX "_"
 #endif /* not NO_UNDERSCORES */
 
 /* Sequent has some changes in the format of DBX symbols.  */
diff --git a/gcc/config/i386/lynx.h b/gcc/config/i386/lynx.h
index 4ac00a052ba..73111f916a5 100644
--- a/gcc/config/i386/lynx.h
+++ b/gcc/config/i386/lynx.h
@@ -1,5 +1,5 @@
 /* Definitions for Intel 386 running LynxOS.
-   Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -24,12 +24,12 @@ Boston, MA 02111-1307, USA.  */
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dunix -Di386 -DI386 -DLynx -DIBITS32 -Asystem(unix) -Asystem(lynx) -Acpu(i386) -Amachine(i386)"
 
-/* This is how to output a reference to a user-level label named NAME.  */
+/* The prefix to add to user-visible assembler symbols. */
 
 /* Override the svr3 convention of adding a leading underscore. */
 
-#undef ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME) fprintf (FILE, "%s", NAME)
+#undef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
 
 /* Apparently LynxOS clobbers ebx when you call into the OS.  */
 
diff --git a/gcc/config/i386/sco5.h b/gcc/config/i386/sco5.h
index 0a56377c16f..13a6798e3ff 100644
--- a/gcc/config/i386/sco5.h
+++ b/gcc/config/i386/sco5.h
@@ -1,6 +1,6 @@
 /* Definitions for Intel 386 running SCO Unix System V 3.2 Version 5.
-   Written by Kean Johnston (hug@netcom.com)
    Copyright (C) 1992, 1995, 1996 Free Software Foundation, Inc.
+   Contributed by Kean Johnston (hug@netcom.com)
 
 This file is part of GNU CC.
 
@@ -483,9 +483,10 @@ do {									\
 #define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM)			\
   fprintf (FILE, ".%s%d:\n", PREFIX, NUM)
 
-#undef ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME)					\
-  fprintf (FILE, "%s", NAME)
+/* The prefix to add to user-visible assembler symbols. */
+
+#undef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
 
 #undef ASM_OUTPUT_SECTION_NAME
 #define ASM_OUTPUT_SECTION_NAME(FILE, DECL, NAME) \
diff --git a/gcc/config/i860/fx2800.h b/gcc/config/i860/fx2800.h
index f528c0c272d..41c5bae3d06 100644
--- a/gcc/config/i860/fx2800.h
+++ b/gcc/config/i860/fx2800.h
@@ -330,8 +330,11 @@ Boston, MA 02111-1307, USA.  */
 
 #undef DWARF_DEBUGGING_INFO
 
-#undef ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME) fprintf (FILE, "_%s", NAME)
+/* The prefix to add to user-visible assembler symbols. */
+
+#undef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX "_"
+
 #undef ASM_OUTPUT_EXTERNAL_LIBCALL
 
 /* ??? Is this used anywhere?  */
diff --git a/gcc/config/m68k/3b1.h b/gcc/config/m68k/3b1.h
index 4c177df9804..5f9ec4c7301 100644
--- a/gcc/config/m68k/3b1.h
+++ b/gcc/config/m68k/3b1.h
@@ -1,8 +1,7 @@
 /* Definitions of target machine for GNU compiler.
    AT&T UNIX PC version (pc7300, 3b1)
-   Written by Alex Crain (alex@umbc3.umd.edu).
-
-   Copyright (C) 1987, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1993, 1996 Free Software Foundation, Inc.
+   Contributed by Alex Crain (alex@umbc3.umd.edu).
 
 This file is part of GNU CC.
 
@@ -119,7 +118,7 @@ output_file_directive ((FILE), main_input_filename)
 #undef ASM_OUTPUT_INTERNAL_LABEL
 #undef ASM_OUTPUT_OPCODE
 #undef ASM_OUTPUT_LOCAL
-#undef ASM_OUTPUT_LABELREF
+#undef USER_LABEL_PREFIX
 #undef ASM_OUTPUT_ASCII
 
 #define TARGET_VERSION fprintf (stderr, " (68k, SGS/AT&T unixpc syntax)");
@@ -437,8 +436,7 @@ int switch_table_difference_label_flag;
   assemble_name ((FILE), (NAME)),		\
   fprintf ((FILE), ",%u\n", (ROUNDED)))
 
-#define ASM_OUTPUT_LABELREF(FILE,NAME)	\
-  fprintf (FILE, "%s", NAME)
+#define USER_LABEL_PREFIX ""
 
 /* Override usual definitions of SDB output macros.
    These definitions differ only in the absence of the period
diff --git a/gcc/config/m68k/mot3300.h b/gcc/config/m68k/mot3300.h
index 8d830a9e3fd..59892aecee1 100644
--- a/gcc/config/m68k/mot3300.h
+++ b/gcc/config/m68k/mot3300.h
@@ -540,12 +540,10 @@ do { long l;					\
     fprintf (FILE, ".%s%d:\n", PREFIX, NUM)
 #endif /* USE_GAS */
 
-/* This is how to output a reference to a user-level label named NAME.
-   `assemble_name' uses this.  */
+/* The prefix to add to user-visible assembler symbols. */
 
-#undef ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME)	\
-  fprintf (FILE, "%s", NAME)
+#undef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
 
 /* This is how to output an element of a case-vector that is absolute.
    (The 68000 does not use such vectors,
diff --git a/gcc/config/m68k/tower-as.h b/gcc/config/m68k/tower-as.h
index d4f15d37535..5f69aa868bd 100644
--- a/gcc/config/m68k/tower-as.h
+++ b/gcc/config/m68k/tower-as.h
@@ -1,14 +1,9 @@
 /* Definitions of target machine for GNU compiler.
    For NCR Tower 32/4x0 and 32/6x0 running System V Release 3.
-   Copyright (C) 1990, 1993, 1994 Free Software Foundation, Inc.
-   Written by Robert Andersson (ra@intsys.no), International Systems,
+   Copyright (C) 1990, 1993, 1994, 1996 Free Software Foundation, Inc.
+   Contributed by Robert Andersson (ra@intsys.no), International Systems,
    Oslo, Norway.
 
-   This file outputs assembler source suitable for the native Tower as
-   and with sdb debugging symbols.  See tower.h for more comments.
-
-   This file was based on m68k.h, hp320.h and 3b1.h as of the 1.37.1 version.
-
 This file is part of GNU CC.
 
 GNU CC is free software; you can redistribute it and/or modify
@@ -27,6 +22,12 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
+/* This file outputs assembler source suitable for the native Tower as
+   and with sdb debugging symbols.  See tower.h for more comments.
+
+   This file was based on m68k.h, hp320.h and 3b1.h as of the
+   1.37.1 version.  */
+
 #include "m68k/tower.h"
 #undef SELECT_RTX_SECTION
 
@@ -586,8 +587,9 @@ do { fprintf (asm_out_file, "\ttag\t");	\
     fprintf (FILE, ",-(%%sp)\n");		\
   } while (0)
 
+/* The prefix to add to user-visible assembler symbols. */
+
 /* We do not want leading underscores.  */
 
-#undef ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME)  \
-  fprintf (FILE, "%s", NAME)
+#undef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
diff --git a/gcc/config/m68k/tower.h b/gcc/config/m68k/tower.h
index 30cc9c1a2f3..73faedbd0e7 100644
--- a/gcc/config/m68k/tower.h
+++ b/gcc/config/m68k/tower.h
@@ -96,8 +96,9 @@ Boston, MA 02111-1307, USA.  */
 #undef IMMEDIATE_PREFIX
 #define IMMEDIATE_PREFIX "&"
 
+/* The prefix to add to user-visible assembler symbols. */
+
 /* We do not want leading underscores.  */
 
-#undef ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME)  \
-  fprintf (FILE, "%s", NAME)
+#undef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
diff --git a/gcc/config/ptx4.h b/gcc/config/ptx4.h
index 41c2706fc85..7bda47c9235 100644
--- a/gcc/config/ptx4.h
+++ b/gcc/config/ptx4.h
@@ -1,7 +1,7 @@
 /* Operating system specific defines to be used when targeting GCC for some
    generic System V Release 4 system.
    Copyright (C) 1996 Free Software Foundation, Inc.
-   Contributed by Ron Guilmette (rfg@segfault.us.com).
+   Contributed by Ron Guilmette (rfg@monkeys.com).
    Renamed and changed to suit Dynix/ptx v4 and later.
    Modified by Tim Wright (timw@sequent.com).
   
@@ -333,14 +333,13 @@ while (0)
 #define ASM_OUTPUT_SKIP(FILE,SIZE) \
   fprintf (FILE, "\t%s\t%u\n", SKIP_ASM_OP, (SIZE))
 
-/* This is how to output a reference to a user-level label named NAME.
-   `assemble_name' uses this.
+/* The prefix to add to user-visible assembler symbols. */
 
    For System V Release 4 the convention is *not* to prepend a leading
    underscore onto user-level symbol names.  */
 
-#undef ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME) fprintf (FILE, "%s", NAME)
+#undef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
 
 /* This is how to output an internal numbered label where
    PREFIX is the class of label and NUM is the number within the class.
diff --git a/gcc/config/sparc/pbd.h b/gcc/config/sparc/pbd.h
index 156c99d72cb..6fb6cb621e8 100644
--- a/gcc/config/sparc/pbd.h
+++ b/gcc/config/sparc/pbd.h
@@ -1,9 +1,6 @@
-/* Definitions of target machine for GNU compiler.
-
-   Citicorp/TTI Unicom PBD version
-   (using GAS and  COFF (encapsulated is unacceptable) )
-
-   Copyright (C) 1990 Free Software Foundation, Inc.
+/* Definitions of target machine for GNU compiler, Citicorp/TTI Unicom PBD
+   version (using GAS and COFF (encapsulated is unacceptable) )
+   Copyright (C) 1990, 1996 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -105,9 +102,10 @@ Boston, MA 02111-1307, USA.  */
   }
  */
 
-#undef  ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME)	\
-  fprintf (FILE, "%s", NAME)
+/* The prefix to add to user-visible assembler symbols. */
+
+#undef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
 
 /* fixes: */
 /*
diff --git a/gcc/config/svr3.h b/gcc/config/svr3.h
index c4f0b012243..6b0034fae86 100644
--- a/gcc/config/svr3.h
+++ b/gcc/config/svr3.h
@@ -1,8 +1,7 @@
-/* svr3.h  --  operating system specific defines to be used when
-   targeting GCC for some generic System V Release 3 system.
+/* Operating system specific defines to be used when targeting GCC for
+   generic System V Release 3 system.
    Copyright (C) 1991, 1996 Free Software Foundation, Inc.
-
-   Written by Ron Guilmette (rfg@netcom.com).
+   Contributed by Ron Guilmette (rfg@monkeys.com).
 
 This file is part of GNU CC.
 
@@ -160,14 +159,13 @@ Boston, MA 02111-1307, USA.
 #undef ASM_BYTE_OP
 #define ASM_BYTE_OP "\t.byte"
 
-/* This is how to output a reference to a user-level label named NAME.
-   `assemble_name' uses this.
+/* The prefix to add to user-visible assembler symbols. */
 
    For System V Release 3 the convention is to prepend a leading
    underscore onto user-level symbol names.  */
 
-#undef ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME) fprintf (FILE, "_%s", NAME)
+#undef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX "_"
 
 /* This is how to output an internal numbered label where
    PREFIX is the class of label and NUM is the number within the class.
diff --git a/gcc/config/svr4.h b/gcc/config/svr4.h
index 1020a1787c4..ddb4536bdc3 100644
--- a/gcc/config/svr4.h
+++ b/gcc/config/svr4.h
@@ -1,7 +1,7 @@
 /* Operating system specific defines to be used when targeting GCC for some
    generic System V Release 4 system.
    Copyright (C) 1991, 1994, 1995, 1996 Free Software Foundation, Inc.
-   Contributed by Ron Guilmette (rfg@segfault.us.com).
+   Contributed by Ron Guilmette (rfg@monkeys.com).
 
 This file is part of GNU CC.
 
@@ -374,14 +374,13 @@ while (0)
 #define ASM_OUTPUT_SKIP(FILE,SIZE) \
   fprintf (FILE, "\t%s\t%u\n", SKIP_ASM_OP, (SIZE))
 
-/* This is how to output a reference to a user-level label named NAME.
-   `assemble_name' uses this.
+/* The prefix to add to user-visible assembler symbols. */
 
    For System V Release 4 the convention is *not* to prepend a leading
    underscore onto user-level symbol names.  */
 
-#undef ASM_OUTPUT_LABELREF
-#define ASM_OUTPUT_LABELREF(FILE,NAME) fprintf (FILE, "%s", NAME)
+#undef USER_LABEL_PREFIX
+#define USER_LABEL_PREFIX ""
 
 /* This is how to output an internal numbered label where
    PREFIX is the class of label and NUM is the number within the class.