4 files changed, 3 insertions, 83 deletions

diff --git a/devel/avr-gdb/Makefile b/devel/avr-gdb/Makefile
index 6e25ebaf9a59..313fff36bd5b 100644
--- a/devel/avr-gdb/Makefile
+++ b/devel/avr-gdb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gdb
-PORTVERSION=	6.8
+PORTVERSION=	7.3.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gdb
diff --git a/devel/avr-gdb/distinfo b/devel/avr-gdb/distinfo
index c3af7111529f..29f873181f39 100644
--- a/devel/avr-gdb/distinfo
+++ b/devel/avr-gdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gdb-6.8.tar.bz2) = eedffd586bf41cf2ae2f77e6819545d6eb1e5062052320a27332fdfaaebdf818
-SIZE (gdb-6.8.tar.bz2) = 15581509
+SHA256 (gdb-7.3.1.tar.bz2) = 6d7bff716fde98d03866a1b747c0929ee7dba49bca13e01d975e0b0fa9b33a28
+SIZE (gdb-7.3.1.tar.bz2) = 19500995
diff --git a/devel/avr-gdb/files/patch-atmega256x-gdb b/devel/avr-gdb/files/patch-atmega256x-gdb
deleted file mode 100644
index 9b013f53b03f..000000000000
--- a/devel/avr-gdb/files/patch-atmega256x-gdb
+++ /dev/null
@@ -1,66 +0,0 @@
---- gdb/avr-tdep.c.orig	2008-01-11 14:19:59.000000000 +0100
-+++ gdb/avr-tdep.c	2010-01-19 11:19:47.000000000 +0100
-@@ -181,8 +181,10 @@
- 
- struct gdbarch_tdep
- {
--  /* FIXME: TRoth: is there anything to put here? */
--  int foo;
-+  /* Size of the PC on the current AVR target.  This is equal 2 for
-+     most AVRs except for the ATmega256x devices that have a 3-byte
-+     PC. */
-+  int pcsize;
- };
- 
- /* Lookup the name of a register given it's number. */
-@@ -1030,22 +1032,29 @@
-                  on the stack is in big endian byte order, even though most
-                  everything else about the avr is little endian. Ick!  */
- 
--              /* FIXME: number of bytes read here will need updated for the
--                 mega256 when it is available.  */
--
-+	      struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
-               ULONGEST pc;
-               unsigned char tmp;
--              unsigned char buf[2];
-+              unsigned char buf[3];
- 
--              read_memory (info->saved_regs[regnum].addr, buf, 2);
-+              read_memory (info->saved_regs[regnum].addr, buf, tdep->pcsize);
- 
-               /* Convert the PC read from memory as a big-endian to
-                  little-endian order. */
--              tmp = buf[0];
--              buf[0] = buf[1];
--              buf[1] = tmp;
-+	      if (tdep->pcsize == 2)
-+		{
-+		  tmp = buf[0];
-+		  buf[0] = buf[1];
-+		  buf[1] = tmp;
-+		}
-+	      else
-+		{
-+		  tmp = buf[0];
-+		  buf[0] = buf[2];
-+		  buf[2] = tmp;
-+		}
- 
--              pc = (extract_unsigned_integer (buf, 2) * 2);
-+              pc = (extract_unsigned_integer (buf, tdep->pcsize) * 2);
-               store_unsigned_integer
- 		(bufferp, register_size (get_frame_arch (next_frame), regnum),
- 		 pc);
-@@ -1280,6 +1289,11 @@
-     case bfd_mach_avr3:
-     case bfd_mach_avr4:
-     case bfd_mach_avr5:
-+      tdep->pcsize = 2;
-+      break;
-+
-+    case bfd_mach_avr6:
-+      tdep->pcsize = 3;
-       break;
-     }
- 
diff --git a/devel/avr-gdb/files/patch-gdb::remote.c b/devel/avr-gdb/files/patch-gdb::remote.c
deleted file mode 100644
index 9c90549552f1..000000000000
--- a/devel/avr-gdb/files/patch-gdb::remote.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- gdb/remote.c~	2008-02-25 10:59:06.000000000 +0100
-+++ gdb/remote.c	2010-01-19 11:30:19.000000000 +0100
-@@ -6102,8 +6102,9 @@
- 				     [PACKET_qXfer_spu_write]);
-     }
- 
--  /* Only handle flash writes.  */
--  if (writebuf != NULL)
-+  /* Only handle flash writes.  Zero OFFSET and LENGTH is just a size
-+   * query only, so proceed anyway. */
-+  if (writebuf != NULL && !(offset == 0 && len == 0))
-     {
-       LONGEST xfered;
-