summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/usr.bin/gdb')
-rw-r--r--gnu/usr.bin/gdb/Makefile.inc1
-rw-r--r--gnu/usr.bin/gdb/arch/amd64/config.h3
-rw-r--r--gnu/usr.bin/gdb/arch/arm/config.h3
-rw-r--r--gnu/usr.bin/gdb/arch/i386/config.h3
-rw-r--r--gnu/usr.bin/gdb/arch/ia64/config.h3
-rw-r--r--gnu/usr.bin/gdb/arch/mips/config.h3
-rw-r--r--gnu/usr.bin/gdb/arch/powerpc/config.h3
-rw-r--r--gnu/usr.bin/gdb/arch/powerpc64/config.h3
-rw-r--r--gnu/usr.bin/gdb/arch/sparc64/config.h3
-rw-r--r--gnu/usr.bin/gdb/gdb/Makefile1
-rw-r--r--gnu/usr.bin/gdb/kgdb/trgt_mips.c11
-rw-r--r--gnu/usr.bin/gdb/libgdb/Makefile10
-rw-r--r--gnu/usr.bin/gdb/libgdb/frame-unwind.diff27
13 files changed, 15 insertions, 59 deletions
diff --git a/gnu/usr.bin/gdb/Makefile.inc b/gnu/usr.bin/gdb/Makefile.inc
index c40e9b8..5e1d5cd 100644
--- a/gnu/usr.bin/gdb/Makefile.inc
+++ b/gnu/usr.bin/gdb/Makefile.inc
@@ -37,6 +37,7 @@ GDB_CROSS_DEBUGGER=
${CNTRB_GDB}/gdb/signals ${CNTRB_GDB}/gdb/tui ${TARGET_SUBDIR}
CFLAGS+= -DHAVE_CONFIG_H -DRL_NO_COMPAT -DMI_OUT=1 -DTUI=1
+CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\"
CFLAGS+= -I.
CFLAGS+= -I${TARGET_SUBDIR}
CFLAGS+= -I${BMAKE_BU}/libbfd -I${BMAKE_BU}/libbfd/${TARGET_CPUARCH}
diff --git a/gnu/usr.bin/gdb/arch/amd64/config.h b/gnu/usr.bin/gdb/arch/amd64/config.h
index ac81c54..674f818 100644
--- a/gnu/usr.bin/gdb/arch/amd64/config.h
+++ b/gnu/usr.bin/gdb/arch/amd64/config.h
@@ -439,9 +439,6 @@
/* Name of this package. */
#define PACKAGE "gdb"
-/* Global directory for separate debug files. */
-#define DEBUGDIR "/usr/local/lib/debug"
-
/* Define to BFD's default architecture. */
#define DEFAULT_BFD_ARCH bfd_i386_arch
diff --git a/gnu/usr.bin/gdb/arch/arm/config.h b/gnu/usr.bin/gdb/arch/arm/config.h
index e1b128c..b2481f8 100644
--- a/gnu/usr.bin/gdb/arch/arm/config.h
+++ b/gnu/usr.bin/gdb/arch/arm/config.h
@@ -451,9 +451,6 @@
/* Name of this package. */
#define PACKAGE "gdb"
-/* Global directory for separate debug files. */
-#define DEBUGDIR "/usr/local/lib/debug"
-
/* Define to BFD's default architecture. */
#define DEFAULT_BFD_ARCH bfd_arm_arch
diff --git a/gnu/usr.bin/gdb/arch/i386/config.h b/gnu/usr.bin/gdb/arch/i386/config.h
index f21da4c..e849e0a 100644
--- a/gnu/usr.bin/gdb/arch/i386/config.h
+++ b/gnu/usr.bin/gdb/arch/i386/config.h
@@ -439,9 +439,6 @@
/* Name of this package. */
#define PACKAGE "gdb"
-/* Global directory for separate debug files. */
-#define DEBUGDIR "/usr/local/lib/debug"
-
/* Define to BFD's default architecture. */
#define DEFAULT_BFD_ARCH bfd_i386_arch
diff --git a/gnu/usr.bin/gdb/arch/ia64/config.h b/gnu/usr.bin/gdb/arch/ia64/config.h
index 5faa96b..4cc29f9 100644
--- a/gnu/usr.bin/gdb/arch/ia64/config.h
+++ b/gnu/usr.bin/gdb/arch/ia64/config.h
@@ -439,9 +439,6 @@
/* Name of this package. */
#define PACKAGE "gdb"
-/* Global directory for separate debug files. */
-#define DEBUGDIR "/usr/local/lib/debug"
-
/* Define to BFD's default architecture. */
#define DEFAULT_BFD_ARCH bfd_ia64_arch
diff --git a/gnu/usr.bin/gdb/arch/mips/config.h b/gnu/usr.bin/gdb/arch/mips/config.h
index 41a6731..2b375a6 100644
--- a/gnu/usr.bin/gdb/arch/mips/config.h
+++ b/gnu/usr.bin/gdb/arch/mips/config.h
@@ -439,9 +439,6 @@
/* Name of this package. */
#define PACKAGE "gdb"
-/* Global directory for separate debug files. */
-#define DEBUGDIR "/usr/local/lib/debug"
-
/* Define to BFD's default architecture. */
#define DEFAULT_BFD_ARCH bfd_mips_arch
diff --git a/gnu/usr.bin/gdb/arch/powerpc/config.h b/gnu/usr.bin/gdb/arch/powerpc/config.h
index f169fad..37416a7 100644
--- a/gnu/usr.bin/gdb/arch/powerpc/config.h
+++ b/gnu/usr.bin/gdb/arch/powerpc/config.h
@@ -439,9 +439,6 @@
/* Name of this package. */
#define PACKAGE "gdb"
-/* Global directory for separate debug files. */
-#define DEBUGDIR "/usr/local/lib/debug"
-
/* Define to BFD's default architecture. */
#define DEFAULT_BFD_ARCH bfd_rs6000_arch
diff --git a/gnu/usr.bin/gdb/arch/powerpc64/config.h b/gnu/usr.bin/gdb/arch/powerpc64/config.h
index d8b9b6d..58843fb 100644
--- a/gnu/usr.bin/gdb/arch/powerpc64/config.h
+++ b/gnu/usr.bin/gdb/arch/powerpc64/config.h
@@ -439,9 +439,6 @@
/* Name of this package. */
#define PACKAGE "gdb"
-/* Global directory for separate debug files. */
-#define DEBUGDIR "/usr/local/lib/debug"
-
/* Define to BFD's default architecture. */
#define DEFAULT_BFD_ARCH bfd_rs6000_arch
diff --git a/gnu/usr.bin/gdb/arch/sparc64/config.h b/gnu/usr.bin/gdb/arch/sparc64/config.h
index 5527a79..974e426 100644
--- a/gnu/usr.bin/gdb/arch/sparc64/config.h
+++ b/gnu/usr.bin/gdb/arch/sparc64/config.h
@@ -439,9 +439,6 @@
/* Name of this package. */
#define PACKAGE "gdb"
-/* Global directory for separate debug files. */
-#define DEBUGDIR "/usr/local/lib/debug"
-
/* Define to BFD's default architecture. */
#define DEFAULT_BFD_ARCH bfd_sparc_arch
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index ef9e135..15eb2eb 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -15,3 +15,4 @@ DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
LDADD= ${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap -lgnuregex
.include <bsd.prog.mk>
+CFLAGS+= -DDEBUGDIR=\"${DEBUGDIR}\"
diff --git a/gnu/usr.bin/gdb/kgdb/trgt_mips.c b/gnu/usr.bin/gdb/kgdb/trgt_mips.c
index 6ad2274..aadf095 100644
--- a/gnu/usr.bin/gdb/kgdb/trgt_mips.c
+++ b/gnu/usr.bin/gdb/kgdb/trgt_mips.c
@@ -115,6 +115,16 @@ static int kgdb_trgt_frame_offset[] = {
offsetof(struct trapframe, a1),
offsetof(struct trapframe, a2),
offsetof(struct trapframe, a3),
+#if defined(__mips_n32) || defined(__mips_n64)
+ offsetof(struct trapframe, a4),
+ offsetof(struct trapframe, a5),
+ offsetof(struct trapframe, a6),
+ offsetof(struct trapframe, a7),
+ offsetof(struct trapframe, t0),
+ offsetof(struct trapframe, t1),
+ offsetof(struct trapframe, t2),
+ offsetof(struct trapframe, t3),
+#else
offsetof(struct trapframe, t0),
offsetof(struct trapframe, t1),
offsetof(struct trapframe, t2),
@@ -123,6 +133,7 @@ static int kgdb_trgt_frame_offset[] = {
offsetof(struct trapframe, t5),
offsetof(struct trapframe, t6),
offsetof(struct trapframe, t7),
+#endif
offsetof(struct trapframe, s0),
offsetof(struct trapframe, s1),
offsetof(struct trapframe, s2),
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile
index b7129a8..ed00525 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile
+++ b/gnu/usr.bin/gdb/libgdb/Makefile
@@ -26,7 +26,7 @@ SRCS= annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c \
elfread.c environ.c eval.c event-loop.c event-top.c exec.c \
expprint.c \
f-exp.y f-lang.c f-typeprint.c f-valprint.c findvar.c \
- ${_fork_child} frame-base.c frame-unwind-kluge.c frame.c \
+ ${_fork_child} frame-base.c frame-unwind.c frame.c \
gdb-events.c gdbarch.c gdbtypes.c gnu-v2-abi.c gnu-v3-abi.c \
hpacc-abi.c \
inf-loop.c infcall.c infcmd.c inflow.c ${_infptrace} infrun.c \
@@ -67,13 +67,7 @@ _infptrace= infptrace.c
_inftarg= inftarg.c
.endif
-GENSRCS= frame-unwind-kluge.c version.c
-
-frame-unwind-kluge.c: frame-unwind.diff
- cat ${CNTRB_GDB}/gdb/frame-unwind.c > ${.TARGET}
- patch ${.TARGET} ${.ALLSRC}
-
-CLEANFILES= frame-unwind-kluge.c.orig
+GENSRCS= version.c
version.c:
echo '#include "version.h"' > ${.TARGET}
diff --git a/gnu/usr.bin/gdb/libgdb/frame-unwind.diff b/gnu/usr.bin/gdb/libgdb/frame-unwind.diff
deleted file mode 100644
index 8143c55..0000000
--- a/gnu/usr.bin/gdb/libgdb/frame-unwind.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-$FreeBSD$
-
-Index: frame-unwind.c
-===================================================================
-RCS file: /home/ncvs/src/contrib/gdb/gdb/frame-unwind.c,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 frame-unwind.c
---- frame-unwind.c 20 Jun 2004 18:16:58 -0000 1.1.1.1
-+++ frame-unwind.c 10 Sep 2005 06:36:55 -0000
-@@ -27,6 +27,8 @@
-
- static struct gdbarch_data *frame_unwind_data;
-
-+frame_unwind_sniffer_ftype *kgdb_sniffer_kluge;
-+
- struct frame_unwind_table
- {
- frame_unwind_sniffer_ftype **sniffer;
-@@ -49,6 +51,8 @@
- {
- struct frame_unwind_table *table = XCALLOC (1, struct frame_unwind_table);
- append_predicate (table, dummy_frame_sniffer);
-+ if (kgdb_sniffer_kluge != NULL)
-+ append_predicate (table, kgdb_sniffer_kluge);
- return table;
- }
-
OpenPOWER on IntegriCloud