[src/trunk]: src/external/gpl3/gdb/lib/libgdb Avoid name conflict

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

details:   https://anonhg.NetBSD.org/src/rev/f1a9e38cf582
branches:  trunk
changeset: 955068:f1a9e38cf582
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Sep 17 16:06:27 2020 +0000

description:
Avoid name conflict

diffstat:

 external/gpl3/gdb/lib/libgdb/Makefile       |  8 +++++---
 external/gpl3/gdb/lib/libgdb/dwarf2-frame.c |  1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r 490472055c21 -r f1a9e38cf582 external/gpl3/gdb/lib/libgdb/Makefile
--- a/external/gpl3/gdb/lib/libgdb/Makefile     Thu Sep 17 16:05:34 2020 +0000
+++ b/external/gpl3/gdb/lib/libgdb/Makefile     Thu Sep 17 16:06:27 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.25 2020/09/17 02:17:52 christos Exp $
+#      $NetBSD: Makefile,v 1.26 2020/09/17 16:06:27 christos Exp $
 
 NOCTF=
 HOSTPROG_CXX=   1
@@ -13,11 +13,10 @@
 
 .include "${GDBARCHDIR}/defs.mk"
 
-SRCS=          ${G_LIBGDB_OBS:.o=.c}
+SRCS=          ${G_LIBGDB_OBS:.o=.c} dwarf2-frame.c
 GCPPFLAGS=     ${G_INTERNAL_CFLAGS}
 CPPFLAGS+=     -I${.CURDIR} \
                -I${GDBARCHDIR} \
-               -I${GDBARCHDIR}/gnulib/import \
                -I${DIST} \
                -I${DIST}/gdb \
                -I${DIST}/gdbsupport \
@@ -26,6 +25,9 @@
                -I${DIST}/include/opcode \
                -I${DIST}/readline \
                -I${DIST}/libdecnumber \
+               -I${.CURDIR}/../libgnulib/arch/${GDB_MACHINE_ARCH} \
+               -I${.CURDIR}/../libgnulib/arch/${GDB_MACHINE_ARCH}/import \
+               -I${.CURDIR}/../libgdbsupport/arch/${GDB_MACHINE_ARCH} \
                -I${.CURDIR}/../libbfd/arch/${GDB_MACHINE_ARCH} \
                -I${.CURDIR}/../libdecnumber/arch/${GDB_MACHINE_ARCH} \
                -I${DIST}/bfd \
diff -r 490472055c21 -r f1a9e38cf582 external/gpl3/gdb/lib/libgdb/dwarf2-frame.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gdb/lib/libgdb/dwarf2-frame.c       Thu Sep 17 16:06:27 2020 +0000
@@ -0,0 +1,1 @@
+#include "dwarf2/frame.c"