Module Name: src
Committed By: christos
Date: Thu Sep 17 16:06:27 UTC 2020
Modified Files:
src/external/gpl3/gdb/lib/libgdb: Makefile
Added Files:
src/external/gpl3/gdb/lib/libgdb: dwarf2-frame.c
Log Message:
Avoid name conflict
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/gpl3/gdb/lib/libgdb/Makefile
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/lib/libgdb/dwarf2-frame.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb/lib/libgdb/Makefile:1.25 src/external/gpl3/gdb/lib/libgdb/Makefile:1.26
--- src/external/gpl3/gdb/lib/libgdb/Makefile:1.25 Wed Sep 16 22:17:52 2020
+++ src/external/gpl3/gdb/lib/libgdb/Makefile Thu Sep 17 12:06:27 2020
@@ -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 @@ GDBARCHDIR= ${.CURDIR}/arch/${GDB_MACHIN
.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 @@ CPPFLAGS+= -I${.CURDIR} \
-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 \
Added files:
Index: src/external/gpl3/gdb/lib/libgdb/dwarf2-frame.c
diff -u /dev/null src/external/gpl3/gdb/lib/libgdb/dwarf2-frame.c:1.1
--- /dev/null Thu Sep 17 12:06:27 2020
+++ src/external/gpl3/gdb/lib/libgdb/dwarf2-frame.c Thu Sep 17 12:06:27 2020
@@ -0,0 +1 @@
+#include "dwarf2/frame.c"
