[src/netbsd-1-5]: src/gnu/dist/gcc Approved by thorpej:

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ba13a133c518
branches:  netbsd-1-5
changeset: 488749:ba13a133c518
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Wed Jul 26 23:21:32 2000 +0000

description:
Approved by thorpej:
Pull in a change critical to making the sparc64 compile:
Redefine ASM_OUTPUT_DWARF_ADDR_CONST() using ASM_OUTPUT_DWARF2_ADDR_CONST(), so
that the latter can take a string.

gnusrc/gnu/dist/gcc/dwarf2out.c                         1.1.1.2 -> 1.2

diffstat:

 gnu/dist/gcc/dwarf2out.c |  10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diffs (20 lines):

diff -r fe043119a785 -r ba13a133c518 gnu/dist/gcc/dwarf2out.c
--- a/gnu/dist/gcc/dwarf2out.c  Wed Jul 26 23:20:14 2000 +0000
+++ b/gnu/dist/gcc/dwarf2out.c  Wed Jul 26 23:21:32 2000 +0000
@@ -346,6 +346,16 @@
   } while (0)
 #endif
 
+/* ??? This macro takes an RTX in dwarfout.c and a string in dwarf2out.c.
+   We resolve the conflict by creating a new macro ASM_OUTPUT_DWARF2_ADDR_CONST
+   for ports that want to support both DWARF1 and DWARF2.  This needs a better
+   solution.  See also the comments in sparc/sp64-elf.h.  */
+#ifdef ASM_OUTPUT_DWARF2_ADDR_CONST
+#undef ASM_OUTPUT_DWARF_ADDR_CONST
+#define ASM_OUTPUT_DWARF_ADDR_CONST(FILE,ADDR) \
+  ASM_OUTPUT_DWARF2_ADDR_CONST (FILE, ADDR)
+#endif
+
 #ifndef ASM_OUTPUT_DWARF_ADDR_CONST
 #define ASM_OUTPUT_DWARF_ADDR_CONST(FILE,ADDR)                         \
   fprintf ((FILE), "\t%s\t%s", UNALIGNED_WORD_ASM_OP, (ADDR))