Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Aug 2012 02:54:50 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r303052 - in head/devel/gdb: . files
Message-ID:  <201208240254.q7O2sohY050134@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Fri Aug 24 02:54:50 2012
New Revision: 303052
URL: http://svn.freebsd.org/changeset/ports/303052

Log:
  - Update to 7.5
  - Remove patches integrated upstream
  
  PR:		ports/170913
  Submitted by:	Luca Pizzammiglio <luca.pizzamiglio@gmail.com> (maintainer)
  Approved by:	eadler (mentor)

Deleted:
  head/devel/gdb/files/amd64bsd-nat.h
  head/devel/gdb/files/patch-gdb-Makefile.in
  head/devel/gdb/files/patch-gdb-amd64bsd-nat.c
  head/devel/gdb/files/patch-gdb-config-i386-fbsd64.mh
  head/devel/gdb/files/patch-gdb-configure
Modified:
  head/devel/gdb/Makefile
  head/devel/gdb/distinfo
  head/devel/gdb/files/extrapatch-gdb-Makefile.in
  head/devel/gdb/files/extrapatch-gdb-configure.tgt
  head/devel/gdb/files/fbsd-threads.c
  head/devel/gdb/files/patch-gdb-amd64fbsd-nat.c
  head/devel/gdb/pkg-plist

Modified: head/devel/gdb/Makefile
==============================================================================
--- head/devel/gdb/Makefile	Fri Aug 24 02:36:17 2012	(r303051)
+++ head/devel/gdb/Makefile	Fri Aug 24 02:54:50 2012	(r303052)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gdb
-PORTVERSION=	7.4.1
-PORTREVISION=	4
+PORTVERSION=	7.5
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
@@ -95,7 +94,6 @@ post-patch:
 .if ${PORT_OPTIONS:MTHREADS}
 	@${CP} ${FILESDIR}/fbsd-threads.c ${WRKSRC}/gdb/
 .endif
-	@${CP} ${FILESDIR}/amd64bsd-nat.h ${WRKSRC}/gdb
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb ${PREFIX}/bin/gdb${VER}

Modified: head/devel/gdb/distinfo
==============================================================================
--- head/devel/gdb/distinfo	Fri Aug 24 02:36:17 2012	(r303051)
+++ head/devel/gdb/distinfo	Fri Aug 24 02:54:50 2012	(r303052)
@@ -1,2 +1,2 @@
-SHA256 (gdb-7.4.1.tar.bz2) = a081343c017732ab4dd30a4730da83667aa01b0b37d1ad3700c3f05a5da0f9f6
-SIZE (gdb-7.4.1.tar.bz2) = 20619200
+SHA256 (gdb-7.5.tar.bz2) = d178c45c328369ae4f24f9a0ec53b7d009e2bfa1d41b7027280b24f58ae61932
+SIZE (gdb-7.5.tar.bz2) = 21327195

Modified: head/devel/gdb/files/extrapatch-gdb-Makefile.in
==============================================================================
--- head/devel/gdb/files/extrapatch-gdb-Makefile.in	Fri Aug 24 02:36:17 2012	(r303051)
+++ head/devel/gdb/files/extrapatch-gdb-Makefile.in	Fri Aug 24 02:54:50 2012	(r303052)
@@ -1,6 +1,6 @@
---- gdb/Makefile.in.orig	2011-03-30 07:55:39.000000000 +0100
-+++ gdb/Makefile.in	2011-10-29 08:02:29.600973609 +0100
-@@ -571,7 +571,7 @@
+--- gdb/Makefile.in.orig	2012-07-02 17:29:33.000000000 +0200
++++ gdb/Makefile.in	2012-08-22 16:50:26.000000000 +0200
+@@ -572,7 +572,7 @@
  	xstormy16-tdep.o \
  	xtensa-config.o xtensa-tdep.o xtensa-linux-tdep.o \
  	glibc-tdep.o \
@@ -8,9 +8,9 @@
 +	fbsd-threads.o \
  	nbsd-tdep.o obsd-tdep.o \
  	sol2-tdep.o \
- 	solib-frv.o solib-irix.o solib-svr4.o solib-target.o \
-@@ -782,7 +782,7 @@
- gnulib/stdint.in.h remote.h gdb.h sparc-nat.h \
+ 	solib-frv.o solib-irix.o solib-svr4.o \
+@@ -779,7 +779,7 @@
+ gnulib/import/stdint.in.h remote.h gdb.h sparc-nat.h \
  gdbthread.h dwarf2-frame.h dwarf2-frame-tailcall.h nbsd-nat.h dcache.h \
  amd64-nat.h s390-tdep.h arm-linux-tdep.h exceptions.h macroscope.h \
 -gdbarch.h bsd-uthread.h gdb_stat.h memory-map.h	memrange.h \
@@ -18,12 +18,12 @@
  mdebugread.h m88k-tdep.h stabsread.h hppa-linux-offsets.h linux-fork.h \
  ser-unix.h inf-ptrace.h terminal.h ui-out.h frame-base.h \
  f-lang.h dwarf2loc.h value.h sparc-tdep.h defs.h target-descriptions.h \
-@@ -1452,7 +1452,7 @@
+@@ -1429,7 +1429,7 @@
  	armnbsd-nat.c armbsd-tdep.c armnbsd-tdep.c armobsd-tdep.c \
  	avr-tdep.c \
  	bfin-linux-tdep.c bfin-tdep.c \
 -	bsd-uthread.c bsd-kvm.c \
 +	fbsd-threads.c bsd-kvm.c \
- 	core-regset.c corelow.c \
+ 	core-regset.c \
  	dcache.c dicos-tdep.c darwin-nat.c \
  	exec.c \

Modified: head/devel/gdb/files/extrapatch-gdb-configure.tgt
==============================================================================
--- head/devel/gdb/files/extrapatch-gdb-configure.tgt	Fri Aug 24 02:36:17 2012	(r303051)
+++ head/devel/gdb/files/extrapatch-gdb-configure.tgt	Fri Aug 24 02:54:50 2012	(r303052)
@@ -1,20 +1,20 @@
---- gdb/configure.tgt.orig	2010-09-30 13:38:12.841406000 -0400
-+++ gdb/configure.tgt	2010-09-30 13:38:49.131127000 -0400
-@@ -169,7 +169,7 @@
+--- gdb/configure.tgt.orig	2012-08-01 21:48:44.000000000 +0200
++++ gdb/configure.tgt	2012-08-22 16:47:02.000000000 +0200
+@@ -176,7 +176,7 @@
  i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
  	# Target: FreeBSD/i386
  	gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
--			bsd-uthread.o corelow.o solib.o solib-svr4.o"
-+			fbsd-threads.o corelow.o solib.o solib-svr4.o"
+-			bsd-uthread.o solib-svr4.o"
++			fbsd-threads.o solib-svr4.o"
  	;;
  i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu)
  	# Target: NetBSD/i386
-@@ -579,7 +579,7 @@
+@@ -606,7 +606,7 @@
  	# Target: FreeBSD/amd64
  	gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o i386-tdep.o \
  			i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
--			bsd-uthread.o corelow.o solib.o solib-svr4.o"
-+			fbsd-threads.o corelow.o solib.o solib-svr4.o"
+-			bsd-uthread.o solib-svr4.o"
++			fbsd-threads.o solib-svr4.o"
  	;;
  x86_64-*-mingw*)
          # Target: MingW/amd64

Modified: head/devel/gdb/files/fbsd-threads.c
==============================================================================
--- head/devel/gdb/files/fbsd-threads.c	Fri Aug 24 02:36:17 2012	(r303051)
+++ head/devel/gdb/files/fbsd-threads.c	Fri Aug 24 02:54:50 2012	(r303052)
@@ -529,7 +529,7 @@ resume_thread_callback (const td_thrhand
 
 static void
 fbsd_thread_resume (struct target_ops *ops,
-		    ptid_t ptid, int step, enum target_signal signo)
+		    ptid_t ptid, int step, enum gdb_signal signo)
 {
   struct target_ops *beneath = find_target_beneath (ops);
   td_thrhandle_t th;
@@ -584,7 +584,7 @@ fbsd_thread_resume (struct target_ops *o
   if (lwp)
     {
       int req = step ? PT_SETSTEP : PT_CLEARSTEP;
-      if (ptrace (req, (pid_t) lwp, (caddr_t) 1, target_signal_to_host(signo)))
+      if (ptrace (req, (pid_t) lwp, (caddr_t) 1, gdb_signal_to_host(signo)))
         perror_with_name ("PT_SETSTEP/PT_CLEARSTEP");
     }
 
@@ -623,7 +623,7 @@ fbsd_thread_resume (struct target_ops *o
 
   /* now continue the process, suspended thread wont run */
   if (ptrace (PT_CONTINUE, proc_handle.pid , (caddr_t)1,
-	      target_signal_to_host(signo)))
+	      gdb_signal_to_host(signo)))
     perror_with_name ("PT_CONTINUE");
 }
 
@@ -734,7 +734,7 @@ fbsd_thread_wait (struct target_ops *ops
 	 */
         attach_thread(ret, &th, &ti, 1);
       }
-      if (ourstatus->value.sig == TARGET_SIGNAL_TRAP)
+      if (ourstatus->value.sig == GDB_SIGNAL_TRAP)
         check_event(ret);
       /* this is a hack, if an event won't cause gdb to stop, for example,
          SIGALRM, gdb resumes the process immediatly without setting

Modified: head/devel/gdb/files/patch-gdb-amd64fbsd-nat.c
==============================================================================
--- head/devel/gdb/files/patch-gdb-amd64fbsd-nat.c	Fri Aug 24 02:36:17 2012	(r303051)
+++ head/devel/gdb/files/patch-gdb-amd64fbsd-nat.c	Fri Aug 24 02:54:50 2012	(r303052)
@@ -1,6 +1,6 @@
---- gdb/amd64fbsd-nat.c.orig	2010-02-03 15:30:25.000000000 +0000
-+++ gdb/amd64fbsd-nat.c	2011-09-23 03:08:51.942111416 +0100
-@@ -27,6 +27,7 @@
+--- gdb/amd64fbsd-nat.c.orig	2012-02-09 17:06:44.000000000 +0100
++++ gdb/amd64fbsd-nat.c	2012-08-22 23:51:38.000000000 +0200
+@@ -26,6 +26,7 @@
  #include <signal.h>
  #include <stddef.h>
  #include <sys/types.h>
@@ -8,16 +8,7 @@
  #include <sys/ptrace.h>
  #include <sys/sysctl.h>
  #include <machine/reg.h>
-@@ -34,6 +35,8 @@
- #include "fbsd-nat.h"
- #include "amd64-tdep.h"
- #include "amd64-nat.h"
-+#include "amd64bsd-nat.h"
-+#include "i386-nat.h"
- 
- 
- /* Offset in `struct reg' where MEMBER is stored.  */
-@@ -92,6 +95,47 @@
+@@ -93,6 +94,47 @@
  };
  
  
@@ -65,23 +56,3 @@
  /* Support for debugging kernel virtual memory images.  */
  
  #include <sys/types.h>
-@@ -155,6 +199,19 @@
- 
-   /* Add some extra features to the common *BSD/i386 target.  */
-   t = amd64bsd_target ();
-+
-+#ifdef HAVE_PT_GETDBREGS
-+
-+  i386_use_watchpoints (t);
-+
-+  i386_dr_low.set_control = amd64bsd_dr_set_control;
-+  i386_dr_low.set_addr = amd64bsd_dr_set_addr;
-+  i386_dr_low.reset_addr = amd64bsd_dr_reset_addr;
-+  i386_dr_low.get_status = amd64bsd_dr_get_status;
-+  i386_set_debug_register_length (8);
-+
-+#endif /* HAVE_PT_GETDBREGS */
-+
-   t->to_pid_to_exec_file = fbsd_pid_to_exec_file;
-   t->to_find_memory_regions = fbsd_find_memory_regions;
-   t->to_make_corefile_notes = fbsd_make_corefile_notes;

Modified: head/devel/gdb/pkg-plist
==============================================================================
--- head/devel/gdb/pkg-plist	Fri Aug 24 02:36:17 2012	(r303051)
+++ head/devel/gdb/pkg-plist	Fri Aug 24 02:54:50 2012	(r303052)
@@ -8,6 +8,7 @@ bin/gdbtui%%VER%%
 %%PYTHON%%share/gdb%%VER%%/python/gdb/command/__init__.py
 %%PYTHON%%share/gdb%%VER%%/python/gdb/command/pretty_printers.py
 %%PYTHON%%share/gdb%%VER%%/python/gdb/command/prompt.py
+%%PYTHON%%share/gdb%%VER%%/python/gdb/command/explore.py
 %%PYTHON%%@dirrm share/gdb%%VER%%/python/gdb/command
 %%PYTHON%%@dirrm share/gdb%%VER%%/python/gdb
 %%PYTHON%%@dirrm share/gdb%%VER%%/python



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208240254.q7O2sohY050134>