diff options
| author | emaste <emaste@FreeBSD.org> | 2013-06-17 18:34:34 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2013-06-17 18:34:34 +0000 |
| commit | 7e1479c35f8619691d2cfae3f32f957848a3b692 (patch) | |
| tree | 6b5075a07bd8b023d15f90306ce2eb22f5d622ae /gnu | |
| parent | 00df95bf48cfbd57dfce15600784ba73faf0b8a7 (diff) | |
| download | FreeBSD-src-7e1479c35f8619691d2cfae3f32f957848a3b692.zip FreeBSD-src-7e1479c35f8619691d2cfae3f32f957848a3b692.tar.gz | |
Fold in frame-unwind patch
After moving to svn there's no need to avoid pulling files off a vendor
branch.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/gdb/libgdb/Makefile | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/gdb/libgdb/frame-unwind.diff | 27 |
2 files changed, 2 insertions, 35 deletions
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; - } - |
