New version

6 files changed, 284 insertions, 1 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index 159f13721d8e..9a095b552691 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.24 2003/09/30 20:16:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.25 2003/10/17 16:39:40 cretin Exp $
 
+*gdb-6.0 (17 Oct 2003)
+
+  17 Oct 2003; Stefan Jones <cretin@gentoo.org> :
+  New version, has most of the old gdb-5.3.90 patch already in, if any are
+  needed for non-x86 arch then feel free to add.
 
 *gdb-5.3.90 (20 Sep 2003)
 
diff --git a/sys-devel/gdb/files/digest-gdb-6.0 b/sys-devel/gdb/files/digest-gdb-6.0
new file mode 100644
index 000000000000..87d17858b44f
--- /dev/null
+++ b/sys-devel/gdb/files/digest-gdb-6.0
@@ -0,0 +1 @@
+MD5 14371795b7903b816a6a88c69cace168 gdb-6.0.tar.bz2 11965008
diff --git a/sys-devel/gdb/files/gdb-6.0-coreutils.patch b/sys-devel/gdb/files/gdb-6.0-coreutils.patch
new file mode 100644
index 000000000000..494ca98b6863
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-6.0-coreutils.patch
@@ -0,0 +1,37 @@
+diff -urpN gdb-5.3.90_20030710.orig/ltcf-c.sh gdb-5.3.90_20030710/ltcf-c.sh
+--- ./ltcf-c.sh	2003-09-20 18:15:02.280018176 +0200
++++ ./ltcf-c.sh	2003-09-20 18:15:18.688523704 +0200
+@@ -153,7 +153,7 @@ EOF
+     # If the export-symbols file already is a .def file (1st line
+     # is EXPORTS), use it as is.
+     # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+         cp $export_symbols $output_objdir/$soname-def;
+       else
+         echo EXPORTS > $output_objdir/$soname-def;
+diff -urpN gdb-5.3.90_20030710.orig/ltcf-gcj.sh gdb-5.3.90_20030710/ltcf-gcj.sh
+--- ./ltcf-gcj.sh	2003-09-20 18:15:02.249022888 +0200
++++ ./ltcf-gcj.sh	2003-09-20 18:15:18.660527960 +0200
+@@ -156,7 +156,7 @@ EOF
+     # If the export-symbols file already is a .def file (1st line
+     # is EXPORTS), use it as is.
+     # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+         cp $export_symbols $output_objdir/$soname-def;
+       else
+         echo EXPORTS > $output_objdir/$soname-def;
+diff -urpN gdb-5.3.90_20030710.orig/src-release gdb-5.3.90_20030710/src-release
+--- ./src-release	2003-09-20 18:15:02.282017872 +0200
++++ ./src-release	2003-09-20 18:15:18.704521272 +0200
+@@ -70,7 +70,7 @@ VER = `	if grep 'AM_INIT_AUTOMAKE.*BFD_V
+ 	elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
+ 	  sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
+ 	elif test -f $(TOOL)/version.in; then \
+-	  head -1 $(TOOL)/version.in; \
++	  head -n 1 $(TOOL)/version.in; \
+ 	elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \
+ 	  sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
+ 	else \
+
diff --git a/sys-devel/gdb/files/gdb-6.0-info.patch b/sys-devel/gdb/files/gdb-6.0-info.patch
new file mode 100644
index 000000000000..527412aa82f2
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-6.0-info.patch
@@ -0,0 +1,29 @@
+--- gdb-6.0/gdb/doc/annotate.info.jj	2003-10-17 08:10:28.083064808 -0700
++++ gdb-6.0/gdb/doc/annotate.info	2003-10-17 08:05:33.502847808 -0700
+@@ -1,6 +1,10 @@
+ This is annotate.info, produced by makeinfo version 4.6 from
+ ./annotate.texinfo.
+ 
++START-INFO-DIR-ENTRY
++* Annotate: (annotate).                 GDB's obsolete annotations.
++END-INFO-DIR-ENTRY
++ 
+    This file documents GDB's obsolete annotations.
+ 
+    Copyright 1994, 1995, 2000, 2001, 2003 Free Software Foundation, Inc.
+--- gdb-6.0/gdb/doc/annotate.texinfo.jj	2003-10-17 08:10:45.697387024 -0700
++++ gdb-6.0/gdb/doc/annotate.texinfo	2003-10-17 08:08:35.701149456 -0700
+@@ -17,6 +17,13 @@
+ @c the user guide to get much bigger it would need to switch to a larger,
+ @c more expensive, form factor and would drive up the manuals publication
+ @c cost.  Having a smaller cheaper manual helps the GNU Press with its sales.
++@ifinfo
++@format
++START-INFO-DIR-ENTRY
++* Annotate: (annotate).                 GDB's obsolete annotations.
++END-INFO-DIR-ENTRY
++@end format
++@end ifinfo
+ 
+ @ifinfo
+ This file documents @value{GDBN}'s obsolete annotations.
diff --git a/sys-devel/gdb/files/gdb-6.0-threadver-aug2003.patch b/sys-devel/gdb/files/gdb-6.0-threadver-aug2003.patch
new file mode 100644
index 000000000000..bf6d2f9bfd2d
--- /dev/null
+++ b/sys-devel/gdb/files/gdb-6.0-threadver-aug2003.patch
@@ -0,0 +1,129 @@
+2003-08-05  Andrew Cagney  <cagney@redhat.com>
+
+	* thread-db.c (verbose_dlsym): New function.
+	(thread_db_load): Use verbose_dlsym
+	(thread_db_new_objfile): Print that libthread_db was loaded, and
+	that thread debugging was enabled.
+
+Index: ./gdb/thread-db.c
+===================================================================
+RCS file: /cvs/src/src/gdb/thread-db.c,v
+retrieving revision 1.33
+diff -u -r1.33 thread-db.c
+--- ./gdb/thread-db.c	5 Jun 2003 18:22:02 -0000	1.33
++++ ./gdb/thread-db.c	8 Aug 2003 14:42:47 -0000
+@@ -375,6 +375,15 @@
+   target_beneath = target;
+ }
+ 
++static void *
++verbose_dlsym (void *handle, const char *name)
++{
++  void *sym = dlsym (handle, name);
++  if (sym == NULL)
++    warning ("Symbol \"%s\" not found in libthread_db: %s", name, dlerror ());
++  return sym;
++}
++
+ static int
+ thread_db_load (void)
+ {
+@@ -394,47 +403,47 @@
+   /* Initialize pointers to the dynamic library functions we will use.
+      Essential functions first.  */
+ 
+-  td_init_p = dlsym (handle, "td_init");
++  td_init_p = verbose_dlsym (handle, "td_init");
+   if (td_init_p == NULL)
+     return 0;
+ 
+-  td_ta_new_p = dlsym (handle, "td_ta_new");
++  td_ta_new_p = verbose_dlsym (handle, "td_ta_new");
+   if (td_ta_new_p == NULL)
+     return 0;
+ 
+-  td_ta_map_id2thr_p = dlsym (handle, "td_ta_map_id2thr");
++  td_ta_map_id2thr_p = verbose_dlsym (handle, "td_ta_map_id2thr");
+   if (td_ta_map_id2thr_p == NULL)
+     return 0;
+ 
+-  td_ta_map_lwp2thr_p = dlsym (handle, "td_ta_map_lwp2thr");
++  td_ta_map_lwp2thr_p = verbose_dlsym (handle, "td_ta_map_lwp2thr");
+   if (td_ta_map_lwp2thr_p == NULL)
+     return 0;
+ 
+-  td_ta_thr_iter_p = dlsym (handle, "td_ta_thr_iter");
++  td_ta_thr_iter_p = verbose_dlsym (handle, "td_ta_thr_iter");
+   if (td_ta_thr_iter_p == NULL)
+     return 0;
+ 
+-  td_thr_validate_p = dlsym (handle, "td_thr_validate");
++  td_thr_validate_p = verbose_dlsym (handle, "td_thr_validate");
+   if (td_thr_validate_p == NULL)
+     return 0;
+ 
+-  td_thr_get_info_p = dlsym (handle, "td_thr_get_info");
++  td_thr_get_info_p = verbose_dlsym (handle, "td_thr_get_info");
+   if (td_thr_get_info_p == NULL)
+     return 0;
+ 
+-  td_thr_getfpregs_p = dlsym (handle, "td_thr_getfpregs");
++  td_thr_getfpregs_p = verbose_dlsym (handle, "td_thr_getfpregs");
+   if (td_thr_getfpregs_p == NULL)
+     return 0;
+ 
+-  td_thr_getgregs_p = dlsym (handle, "td_thr_getgregs");
++  td_thr_getgregs_p = verbose_dlsym (handle, "td_thr_getgregs");
+   if (td_thr_getgregs_p == NULL)
+     return 0;
+ 
+-  td_thr_setfpregs_p = dlsym (handle, "td_thr_setfpregs");
++  td_thr_setfpregs_p = verbose_dlsym (handle, "td_thr_setfpregs");
+   if (td_thr_setfpregs_p == NULL)
+     return 0;
+ 
+-  td_thr_setgregs_p = dlsym (handle, "td_thr_setgregs");
++  td_thr_setgregs_p = verbose_dlsym (handle, "td_thr_setgregs");
+   if (td_thr_setgregs_p == NULL)
+     return 0;
+ 
+@@ -587,6 +596,30 @@
+ {
+   td_err_e err;
+ 
++  /* First time through, report that libthread_db was successfuly
++     loaded.  Can't print this in in thread_db_load as, at that stage,
++     the interpreter and it's console haven't started.  The real
++     problem here is that libthread_db is loaded too early - it should
++     only be loaded when there is a program to debug.  */
++  {
++    static int dejavu;
++    if (!dejavu)
++      {
++	Dl_info info;
++	const char *library = NULL;
++	/* Try dladdr.  */
++	if (dladdr ((*td_ta_new_p), &info) != 0)
++	  library = info.dli_fname;
++	/* Try dlinfo?  */
++	if (library == NULL)
++	  /* Paranoid - don't let a NULL path slip through.  */
++	  library = LIBTHREAD_DB_SO;
++	printf_unfiltered ("Using host libthread_db library \"%s\".\n",
++			   library);
++	dejavu = 1;
++      }
++  }
++
+   /* Don't attempt to use thread_db on targets which can not run
+      (core files).  */
+   if (objfile == NULL || !target_has_execution)
+@@ -624,6 +657,8 @@
+       break;
+ 
+     case TD_OK:
++      printf_unfiltered ("[Thread debugging using libthread_db enabled]\n");
++
+       /* The thread library was detected.  Activate the thread_db target.  */
+       push_target (&thread_db_ops);
+       using_thread_db = 1;
diff --git a/sys-devel/gdb/gdb-6.0.ebuild b/sys-devel/gdb/gdb-6.0.ebuild
new file mode 100644
index 000000000000..59903f7d524a
--- /dev/null
+++ b/sys-devel/gdb/gdb-6.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.0.ebuild,v 1.1 2003/10/17 16:39:40 cretin Exp $
+
+IUSE="nls"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="GNU debugger"
+HOMEPAGE="http://sources.redhat.com/gdb/"
+SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~mips"
+
+DEPEND=">=sys-libs/ncurses-5.2-r2
+	nls? ( sys-devel/gettext )"
+
+inherit flag-o-matic eutils
+replace-flags -O? -O2
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/gdb-6.0-threadver-aug2003.patch
+	epatch ${FILESDIR}/gdb-6.0-coreutils.patch
+	epatch ${FILESDIR}/gdb-6.0-info.patch
+}
+
+src_compile() {
+
+	local myconf
+
+	use nls && myconf="--enable-nls" || myconf="--disable-nls"
+
+	econf ${myconf} || die
+
+	make || die
+}
+
+src_install() {
+
+	 make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die
+
+	cd gdb/doc
+	make \
+		infodir=${D}/usr/share/info \
+		install-info || die
+
+	cd ${S}/bfd/doc
+	make \
+		infodir=${D}/usr/share/info \
+		install-info || die
+
+	cd ${S}
+
+	# These includes and libs are in binutils already
+	rm -f ${D}/usr/lib/libbfd.*
+	rm -r ${D}/usr/lib/libiberty.*
+	rm -f ${D}/usr/lib/libopcodes.*
+
+	rm -rf ${D}/usr/include
+
+	dodoc COPYING* README
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/COPYING* gdb/README \
+		gdb/MAINTAINERS gdb/NEWS gdb/ChangeLog* \
+		gdb/TODO
+
+	docinto sim
+	dodoc sim/ChangeLog sim/MAINTAINERS sim/README-HACKING
+
+	docinto mmalloc
+	dodoc mmalloc/COPYING.LIB mmalloc/MAINTAINERS \
+		mmalloc/ChangeLog mmalloc/TODO
+}
+