Update to GDB 6.2.1. This release is primarily a bug fix release although

it includes an improved i386 prologue analyzer was improved to deal better
with the prologues generated by GCC 3.3 and later.

8 files changed, 59 insertions, 154 deletions

diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index 19198acca31..ae330343c11 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2004/10/03 00:13:27 tv Exp $
+# $NetBSD: Makefile,v 1.7 2004/10/04 22:35:17 shannonjr Exp $
 #
 
-DISTNAME=		gdb-6.1.1
+DISTNAME=		gdb-6.2.1
 PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://sources.redhat.com/pub/gdb/releases/
@@ -19,6 +19,7 @@ USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
+AUTOCONF_REQD=		2.13
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/gdb6
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/gdb6
 
@@ -32,6 +33,11 @@ INFO_FILES+=		stabs.info standards.info
 pre-patch:
 	${CP} ${FILESDIR}/nbsd-nat.c ${WRKSRC}/gdb
 
+pre-configure:
+	cd ${WRKSRC}/gdb;                                           \
+	${AUTOHEADER};                                          \
+	${AUTOCONF}
+
 do-test:
 	if `${PKG_INFO} -qe dejagnu` ;then		\
 		(cd ${WRKSRC} && ${GMAKE} check);	\
@@ -40,4 +46,5 @@ do-test:
 	fi
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gdb6/distinfo b/devel/gdb6/distinfo
index 4d25a5e1457..fb6679d5fdc 100644
--- a/devel/gdb6/distinfo
+++ b/devel/gdb6/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.3 2004/06/28 20:43:54 shannonjr Exp $
+$NetBSD: distinfo,v 1.4 2004/10/04 22:35:17 shannonjr Exp $
 
-SHA1 (gdb-6.1.1.tar.bz2) = 39f239373e282061eb6b7d024f17516e2e6e2226
-Size (gdb-6.1.1.tar.bz2) = 12586670 bytes
+SHA1 (gdb-6.2.1.tar.bz2) = 50cee3887744c4140aafcc0e4eb579d94464dfd7
+Size (gdb-6.2.1.tar.bz2) = 12820148 bytes
 SHA1 (patch-Makefile_tpl) = b5c98fc990606e2f5c566864d02565d8fc9adeb4
 SHA1 (patch-ax_gdb_c) = bc9a4e5d77d571a6f06b88984fb2030beec37654
+SHA1 (patch-bsd_kvm_c) = 909612a85a4c46a13f9de3408df4c69e502c02a5
 SHA1 (patch-cli_cli_decode_c) = 19dbdb326643bf32a3d0c26cfea056cca19deb13
 SHA1 (patch-cli_cli_dump_c) = 976cbe2b27c23a113c43cab791562a04d9e6d7e3
 SHA1 (patch-cli_cli_script_c) = c53cc22ac5a2c5d5b2c1a7b0825558d8787b2bed
@@ -11,10 +12,9 @@ SHA1 (patch-cli_cli_setshow_c) = 048c03512a18f3234422a3afc00d6c45f2dea58d
 SHA1 (patch-cli_cmds_c) = 66e40920b5de734cbcf66c0b357e82a74f3c48c0
 SHA1 (patch-config_xm_nbsd_h) = a54471bf7cdd42def5e78137df3674988ae3c04b
 SHA1 (patch-corelow_c) = 6ae7afb646fe7464b8a3667913ac6681b1df34e6
-SHA1 (patch-gdb_configure_in) = 5721068e232c1418bec9a3e7b2dd0d911f841f27
-SHA1 (patch-i386_nbsdelf_mh) = 45b48c56f8d3e6ad61644ee02fd04d21c79fba20
+SHA1 (patch-gdb_configure_in) = c883cc007cd43c478b1ba0f09ca084391552ba3b
+SHA1 (patch-i386_nbsdelf_mh) = 3d9a9eb8dce8a8cb83f8e7afc504bf52cdec0b1d
 SHA1 (patch-i386_nm_nbsd_h) = 11df264e672894836effbb922381dff6abb42aca
-SHA1 (patch-i386bsd_nat_c) = 00e6c4298513e237dab5040dcb58e536a5c530e5
 SHA1 (patch-i386nbsd_tdep_c) = 6b977d1da6d94ff32bdf1e3627ee534333cc2a79
 SHA1 (patch-i387_tdep_c) = 3e41ee1623a52802268d5986559ce7ab742f36e7
 SHA1 (patch-inftarg_c) = bf4b1c62b003e65f5810a7d28f8464e936e8d190
@@ -27,9 +27,8 @@ SHA1 (patch-mi_mi_getopt_c) = 272b4035d1bcde2fadc04a90ad471de681680c34
 SHA1 (patch-mi_mi_interp_c) = bacd2687675ccbb7cbc05359323c0bf32f75e9e5
 SHA1 (patch-mi_mi_main_c) = edcb6662c891738a0582bbfed151bff3812a5f8d
 SHA1 (patch-mi_mi_out_c) = b3f7b9f8a3ad7762637fe9f60a45e50206b713ae
-SHA1 (patch-nm_nbsd_h) = cb22084e35ec088a5a2c9153f83e13406e6a8e78
+SHA1 (patch-nm_nbsd_h) = d85e155d88e17da9c316c69e6fea3a7ba2e470ee
 SHA1 (patch-readline_rltty_c) = 63dde49eaf61bf85ce6dae12ec9af33ae4addfb5
-SHA1 (patch-remote_c) = 1d61936ee63219576a1d70d154d8696dfe7de29e
 SHA1 (patch-remote_fileio_c) = 9c8d886a5b412e64a9a8e6165110a5c336ff65ae
 SHA1 (patch-ser_pipe_c) = 840ce6ceb34afea4c8b789c70fb848ad9942ce39
 SHA1 (patch-tui_interp_c) = dd353978d62cc45aadf6259e8b5f7b2895317f9c
diff --git a/devel/gdb6/patches/patch-bsd_kvm_c b/devel/gdb6/patches/patch-bsd_kvm_c
new file mode 100644
index 00000000000..6d1098f75b9
--- /dev/null
+++ b/devel/gdb6/patches/patch-bsd_kvm_c
@@ -0,0 +1,16 @@
+$NetBSD: patch-bsd_kvm_c,v 1.1 2004/10/04 22:35:17 shannonjr Exp $
+
+--- ./gdb/bsd-kvm.c.orig	2004-07-03 07:17:33.000000000 -0600
++++ ./gdb/bsd-kvm.c
+@@ -228,7 +228,11 @@ bsd_kvm_proc_cmd (char *arg, int fromtty
+     error ("No kernel memory image.");
+ 
+   addr = parse_and_eval_address (arg);
++#ifdef HAVE_STRUCT_LWP
++  addr += offsetof (struct lwp, l_addr);
++#else
+   addr += offsetof (struct proc, p_addr);
++#endif
+ 
+   if (kvm_read (core_kd, addr, &bsd_kvm_paddr, sizeof bsd_kvm_paddr) == -1)
+     error ("%s", kvm_geterr (core_kd));
diff --git a/devel/gdb6/patches/patch-gdb_configure_in b/devel/gdb6/patches/patch-gdb_configure_in
index 7c71b4fd2df..a647109a76a 100644
--- a/devel/gdb6/patches/patch-gdb_configure_in
+++ b/devel/gdb6/patches/patch-gdb_configure_in
@@ -1,27 +1,21 @@
-$NetBSD: patch-gdb_configure_in,v 1.1.1.1 2004/06/01 19:29:30 shannonjr Exp $
+$NetBSD: patch-gdb_configure_in,v 1.2 2004/10/04 22:35:17 shannonjr Exp $
 
---- gdb/configure.in.orig	2004-02-25 17:41:46.000000000 -0700
+--- gdb/configure.in.orig	2004-07-17 05:29:08.000000000 -0600
 +++ gdb/configure.in
-@@ -941,6 +941,22 @@ if test ${build} = ${host} -a ${host} = 
-          CONFIG_LDFLAGS="${CONFIG_LDFLAGS} -lpthdebug"
-       fi
-       ;;
-+   netbsd*)
-+      AC_MSG_CHECKING(for NetBSD thread debugging library)
-+      AC_CACHE_VAL(gdb_cv_have_netbsd_thread_debug,
-+                   [AC_TRY_COMPILE([#include <pthread_dbg.h>],
-+                                   [#ifndef TD_STATE_RUNNING
-+                                    #error
-+                                    #endif],
-+                                   gdb_cv_have_netbsd_thread_debug=yes,
-+                                   gdb_cv_have_netbsd_thread_debug=no)])
-+      AC_MSG_RESULT($gdb_cv_have_netbsd_thread_debug)
-+      if test $gdb_cv_have_netbsd_thread_debug = yes; then
-+         CONFIG_SRCS="${CONFIG_SRCS} nbsd-thread.c"
-+         CONFIG_OBS="${CONFIG_OBS} nbsd-thread.o"
-+         CONFIG_LDFLAGS="${CONFIG_LDFLAGS} -lpthread_dbg"
-+      fi
-+      ;;
-    esac
-    AC_SUBST(CONFIG_LDFLAGS)
+@@ -504,6 +504,16 @@ if test $gdb_cv_struct_thread_td_pcb = y
+             [Define to 1 if your system has td_pcb in struct thread.])
  fi
+ 
++# See if <sys/lwp.h> defines `struct lwp`.
++AC_CACHE_CHECK([for struct lwp], gdb_cv_struct_lwp,
++[AC_TRY_COMPILE([#include <sys/param.h>
++#include <sys/lwp.h>], [struct lwp l;],
++gdb_cv_struct_lwp=yes, gdb_cv_struct_lwp=no)])
++if test $gdb_cv_struct_lwp = yes; then
++  AC_DEFINE(HAVE_STRUCT_LWP, 1,
++            [Define to 1 if your system has struct lwp.])
++fi
++
+ # See if <machine/reg.h> degines `struct reg'.
+ AC_CACHE_CHECK([for struct reg in machine/reg.h], gdb_cv_struct_reg,
+ [AC_TRY_COMPILE([#include <sys/types.h>
diff --git a/devel/gdb6/patches/patch-i386_nbsdelf_mh b/devel/gdb6/patches/patch-i386_nbsdelf_mh
index 87a7b4a0b03..886cf55b8e7 100644
--- a/devel/gdb6/patches/patch-i386_nbsdelf_mh
+++ b/devel/gdb6/patches/patch-i386_nbsdelf_mh
@@ -1,10 +1,11 @@
-$NetBSD: patch-i386_nbsdelf_mh,v 1.1.1.1 2004/06/01 19:29:30 shannonjr Exp $
+$NetBSD: patch-i386_nbsdelf_mh,v 1.2 2004/10/04 22:35:17 shannonjr Exp $
 
---- gdb/config/i386/nbsdelf.mh.orig	2004-02-22 09:20:22.000000000 -0700
+--- gdb/config/i386/nbsdelf.mh.orig	2004-06-27 10:22:43.000000000 -0600
 +++ gdb/config/i386/nbsdelf.mh
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
  # Host: NetBSD/i386 ELF
--NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o
-+NATDEPFILES= fork-child.o nbsd-nat.o infptrace.o inftarg.o i386bsd-nat.o
+-NATDEPFILES= fork-child.o infptrace.o inftarg.o \
++NATDEPFILES= fork-child.o nbsd-nat.o infptrace.o inftarg.o \
+ 	i386bsd-nat.o i386nbsd-nat.o bsd-kvm.o
  NAT_FILE= nm-nbsd.h
  XM_FILE= xm-nbsd.h
diff --git a/devel/gdb6/patches/patch-i386bsd_nat_c b/devel/gdb6/patches/patch-i386bsd_nat_c
deleted file mode 100644
index 56219075249..00000000000
--- a/devel/gdb6/patches/patch-i386bsd_nat_c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-i386bsd_nat_c,v 1.1.1.1 2004/06/01 19:29:30 shannonjr Exp $
-
---- gdb/i386bsd-nat.c.orig	2003-09-28 07:35:44.000000000 -0600
-+++ gdb/i386bsd-nat.c
-@@ -109,11 +109,13 @@ static int have_ptrace_xmmregs = -1;
- 
- /* Return nonzero if we shouldn't try to fetch register REGNO.  */
- 
-+#if !defined (CANNOT_FETCH_REGISTER)
- static int
- cannot_fetch_register (int regno)
- {
-   return (reg_offset[regno] == -1);
- }
-+#endif
- 
- 
- /* Transfering the registers between GDB, inferiors and core files.  */
diff --git a/devel/gdb6/patches/patch-nm_nbsd_h b/devel/gdb6/patches/patch-nm_nbsd_h
index 2cee69bd5aa..ca3b18206ac 100644
--- a/devel/gdb6/patches/patch-nm_nbsd_h
+++ b/devel/gdb6/patches/patch-nm_nbsd_h
@@ -1,8 +1,8 @@
-$NetBSD: patch-nm_nbsd_h,v 1.1.1.1 2004/06/01 19:29:30 shannonjr Exp $
+$NetBSD: patch-nm_nbsd_h,v 1.2 2004/10/04 22:35:17 shannonjr Exp $
 
---- gdb/config/nm-nbsd.h.orig	2002-05-21 21:59:53.000000000 -0600
+--- gdb/config/nm-nbsd.h.orig	2004-10-04 08:11:51.000000000 -0600
 +++ gdb/config/nm-nbsd.h
-@@ -18,10 +18,16 @@
+@@ -18,8 +18,13 @@
     Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.  */
  
@@ -11,10 +11,7 @@ $NetBSD: patch-nm_nbsd_h,v 1.1.1.1 2004/06/01 19:29:30 shannonjr Exp $
  
  #define FETCH_INFERIOR_REGISTERS
  
- #define ATTACH_DETACH
- 
  #include "solib.h"		/* Support for shared libraries. */
-+
 +#include <signal.h>
 +#ifdef SIGRTMIN
 +#define REALTIME_LO SIGRTMIN
diff --git a/devel/gdb6/patches/patch-remote_c b/devel/gdb6/patches/patch-remote_c
deleted file mode 100644
index d7a4d268675..00000000000
--- a/devel/gdb6/patches/patch-remote_c
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-remote_c,v 1.1.1.1 2004/06/01 19:29:30 shannonjr Exp $
-
---- gdb/remote.c.orig	2004-02-25 13:41:00.000000000 -0700
-+++ gdb/remote.c
-@@ -645,8 +645,6 @@ add_packet_config_cmd (struct packet_con
- 		       struct cmd_list_element **show_remote_list,
- 		       int legacy)
- {
--  struct cmd_list_element *set_cmd;
--  struct cmd_list_element *show_cmd;
-   char *set_doc;
-   char *show_doc;
-   char *cmd_name;
-@@ -2324,8 +2322,6 @@ remote_detach (char *args, int from_tty)
- static void
- remote_disconnect (char *args, int from_tty)
- {
--  struct remote_state *rs = get_remote_state ();
--  char *buf = alloca (rs->remote_packet_size);
- 
-   if (args)
-     error ("Argument given to \"detach\" when remotely debugging.");
-@@ -2718,11 +2714,18 @@ async_remote_interrupt_twice (gdb_client
- static void
- cleanup_sigint_signal_handler (void *dummy)
- {
-+  struct async_signal_handler *tmp;
-   signal (SIGINT, handle_sigint);
-   if (sigint_remote_twice_token)
--    delete_async_signal_handler ((struct async_signal_handler **) & sigint_remote_twice_token);
-+  {
-+    tmp = (struct async_signal_handler *) sigint_remote_twice_token;
-+    delete_async_signal_handler (&tmp);
-+  }
-   if (sigint_remote_token)
--    delete_async_signal_handler ((struct async_signal_handler **) & sigint_remote_token);
-+  {
-+    tmp = (struct async_signal_handler *) sigint_remote_token;
-+    delete_async_signal_handler (&tmp);
-+  }
- }
- 
- /* Send ^C to target to halt it.  Target will respond, and send us a
-@@ -2895,7 +2898,6 @@ remote_wait (ptid_t ptid, struct target_
- 	  continue;
- 	case 'T':		/* Status with PC, SP, FP, ... */
- 	  {
--	    int i;
- 	    char regs[MAX_REGISTER_SIZE];
- 
- 	    /* Expedited reply, containing Signal, {regno, reg} repeat */
-@@ -3084,7 +3086,6 @@ remote_async_wait (ptid_t ptid, struct t
- 	  continue;
- 	case 'T':		/* Status with PC, SP, FP, ... */
- 	  {
--	    int i;
- 	    char regs[MAX_REGISTER_SIZE];
- 
- 	    /* Expedited reply, containing Signal, {regno, reg} repeat */
-@@ -3385,7 +3386,6 @@ store_register_using_P (int regnum)
-   char *buf = alloca (rs->remote_packet_size);
-   char regp[MAX_REGISTER_SIZE];
-   char *p;
--  int i;
- 
-   sprintf (buf, "P%s=", phex_nz (reg->pnum, 0));
-   p = buf + strlen (buf);
-@@ -3406,7 +3406,6 @@ remote_store_registers (int regnum)
-   struct remote_state *rs = get_remote_state ();
-   char *buf;
-   char *regs;
--  int i;
-   char *p;
- 
-   set_thread (PIDGET (inferior_ptid), 1);
-@@ -4978,7 +4977,6 @@ remote_rcmd (char *command,
- 	     struct ui_file *outbuf)
- {
-   struct remote_state *rs = get_remote_state ();
--  int i;
-   char *buf = alloca (rs->remote_packet_size);
-   char *p = buf;
- 
-@@ -5453,7 +5451,6 @@ _initialize_remote (void)
- {
-   static struct cmd_list_element *remote_set_cmdlist;
-   static struct cmd_list_element *remote_show_cmdlist;
--  struct cmd_list_element *tmpcmd;
- 
-   /* architecture specific data */
-   remote_gdbarch_data_handle = register_gdbarch_data (init_remote_state);