Bug 178257 - [MAINTAINER] Upgrade devel/gdb to 7.6
Summary: [MAINTAINER] Upgrade devel/gdb to 7.6
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-04-30 13:30 UTC by luca.pizzamiglio
Modified: 2013-05-16 18:10 UTC (History)
0 users

See Also:


Attachments
file.diff (16.68 KB, patch)
2013-04-30 13:30 UTC, luca.pizzamiglio
no flags Details | Diff
file.dat (215 bytes, text/plain; charset="us-ascii")
2013-05-16 18:07 UTC, dfilter service
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description luca.pizzamiglio 2013-04-30 13:30:00 UTC
Updating gdb to 7.6

Moreover:
Fix vector::size() call in gdb (thanks Yuri for reporting and the help)

Fix: Patch attached with submission follows:
Comment 1 Raphael Kubo da Costa freebsd_committer freebsd_triage 2013-05-11 23:20:45 UTC
files/patch-opcodes-ia64-asmtab.c has fails to apply correctly with both
`patch' and `svn patch', perhaps because of the encoding stuff. Do you
have any idea how to apply it or if it may be wrong?
Comment 2 luca.pizzamiglio 2013-05-12 21:55:02 UTC
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

That's quite strange. I guess the econding is creating the problem here.

I tested the patch on several systems (FreeBSD 8,9,10, i386 and
amd64), with different file systems and char code configuration.
Moreover, I've got no problems on redport.

The goal of this patch is to remove this strange character, that
causes a warning with clang (with -Werror activated) about
non-standard encoding. I don't know why you're experiencing problems,
I followed the procedure I used to create the former patch.

How could I help you?

On 05/12/2013 12:20 AM, Raphael Kubo da Costa wrote:
> files/patch-opcodes-ia64-asmtab.c has fails to apply correctly with
> both `patch' and `svn patch', perhaps because of the encoding
> stuff. Do you have any idea how to apply it or if it may be wrong?
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRkAGmAAoJENa/R4cs3elFHQ4P/R2VD7x3CSu6OdsvlnF7DUoV
+Kg0QN93U+vQJke7ZAsvqoNmP22sOpGtmxi48XzSbgT3jIyKbvD/PVYgsxyk0DRN
a6vCbgFjoSL103x35qMnprPpXFpZqbEAayQD82tKY/73zTOWPVFst5x109TFoYfC
J4jcAfALBXFMgb0RkUJ0ciT4EcvU38atfWeD80ufrWF2VPLDJstG9oNm5Peoases
3pL0YxaY5f31/fjpfS9Z3o5GtzyITRzEsR+u3guy/aU4C4CiyIHnGxKffLgtvj5Y
S2I87v5Bos5RKmFspsXktgAaWkKMJgyVRdZx2FuseDCB9AVoXxYDClGAGsxG+VSF
mJtjTliag6A0tLLCPs3q443LwSPNDtFY6/d4/wKHO95j2MnLrylglyeIR7dQ5YXC
VIRXd/HGH79icnWLaZnnB8yzVxcMJ8FRDmMW2rw3D29S++lAc9g6NlcDfprRrX9V
G2gmSV82N9VXy+pqSaLL1K3XUr1U1aW2Di8hEucFl1qaBxYfghg9YEKLGPsli3Ld
ohb1YewnrJZyUGqqUfunBh+HQWa6/251zS5iw4MXxSkx1ZGsrXDAStvzN9/pYTA4
4mUJ30i598HzDASWMDRmvJH+1Mcz9edouH+wTDUlCxJDfSdl8EALmR3mUwhXTjow
1Ou/PDo4kRZ4s8tQadQL
=E+lb
-----END PGP SIGNATURE-----
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-05-16 18:07:23 UTC
Author: rakuco
Date: Thu May 16 17:07:13 2013
New Revision: 318323
URL: http://svnweb.freebsd.org/changeset/ports/318323

Log:
  Update to 7.6.
  
  PR:		ports/178257
  Submitted by:	Luca Pizzamiglio <luca.pizzamiglio@gmail.com> (maintainer)

Added:
  head/devel/gdb/files/patch-gdb-amd64bsd-nat.c   (contents, props changed)
  head/devel/gdb/files/patch-opcodes-v850-dis.c   (contents, props changed)
Deleted:
  head/devel/gdb/files/patch-bfd-elf32-microblaze.c
  head/devel/gdb/files/patch-bfd-elf32-xtensa.c
  head/devel/gdb/files/patch-opcodes-tic54x-dis.c
Modified:
  head/devel/gdb/Makefile
  head/devel/gdb/distinfo
  head/devel/gdb/files/fbsd-threads.c
  head/devel/gdb/files/patch-gdb-i386fbsd-tdep.c
  head/devel/gdb/files/patch-opcodes-ia64-asmtab.c

Modified: head/devel/gdb/Makefile
==============================================================================
--- head/devel/gdb/Makefile	Thu May 16 15:10:12 2013	(r318322)
+++ head/devel/gdb/Makefile	Thu May 16 17:07:13 2013	(r318323)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	gdb
-PORTVERSION=	7.5.1
-PORTREVISION=	1
+PORTVERSION=	7.6
+#PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 

Modified: head/devel/gdb/distinfo
==============================================================================
--- head/devel/gdb/distinfo	Thu May 16 15:10:12 2013	(r318322)
+++ head/devel/gdb/distinfo	Thu May 16 17:07:13 2013	(r318323)
@@ -1,2 +1,2 @@
-SHA256 (gdb-7.5.1.tar.bz2) = 070b808d289fa8f0291738eeaccc0cd7700d476998781f572856155240d29d20
-SIZE (gdb-7.5.1.tar.bz2) = 21349391
+SHA256 (gdb-7.6.tar.bz2) = a410e8f35ee70cce83dbbf1da9e2a8373f271ac0e4b71db4336ae293fc7bdf1b
+SIZE (gdb-7.6.tar.bz2) = 24333590

Modified: head/devel/gdb/files/fbsd-threads.c
==============================================================================
--- head/devel/gdb/files/fbsd-threads.c	Thu May 16 15:10:12 2013	(r318322)
+++ head/devel/gdb/files/fbsd-threads.c	Thu May 16 17:07:13 2013	(r318323)
@@ -338,7 +338,7 @@ extract_func_ptr(void *value)
 
   return (extract_typed_address
 	  ((gdb_byte *)value,
-	   builtin_type (target_gdbarch)->builtin_func_ptr));
+	   builtin_type (target_gdbarch ())->builtin_func_ptr));
 }
 
 static CORE_ADDR
@@ -347,7 +347,7 @@ extract_data_ptr(void *value)
 
   return (extract_typed_address
 	  ((gdb_byte *)value,
-	   builtin_type (target_gdbarch)->builtin_data_ptr));
+	   builtin_type (target_gdbarch ())->builtin_data_ptr));
 }
 
 static td_err_e
@@ -363,10 +363,10 @@ enable_thread_event (td_thragent_t *thre
 
   /* Set up the breakpoint.  */
   (*bp) = (gdbarch_convert_from_func_ptr_addr
-	   (target_gdbarch,
+	   (target_gdbarch (),
 	    extract_func_ptr(&notify.u.bptaddr),
 	    &current_target));
-  create_thread_event_breakpoint (target_gdbarch, (*bp));
+  create_thread_event_breakpoint (target_gdbarch (), (*bp));
 
   return TD_OK;
 }
@@ -1537,7 +1537,7 @@ ps_lgetregs (struct ps_prochandle *ph, l
   old_chain = save_inferior_ptid ();
 
   inferior_ptid = BUILD_LWP (lwpid, ph->pid);
-  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
+  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch ());
 
   target_fetch_registers (regcache, -1);
   fill_gregset (regcache, gregset, -1);
@@ -1553,7 +1553,7 @@ ps_lsetregs (struct ps_prochandle *ph, l
 
   old_chain = save_inferior_ptid ();
   inferior_ptid = BUILD_LWP (lwpid, ph->pid);
-  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
+  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch ());
 
   supply_gregset (regcache, gregset);
   target_store_registers (regcache, -1);
@@ -1569,7 +1569,7 @@ ps_lgetfpregs (struct ps_prochandle *ph,
 
   old_chain = save_inferior_ptid ();
   inferior_ptid = BUILD_LWP (lwpid, ph->pid);
-  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
+  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch ());
 
   target_fetch_registers (regcache, -1);
   fill_fpregset (regcache, fpregset, -1);
@@ -1586,7 +1586,7 @@ ps_lsetfpregs (struct ps_prochandle *ph,
 
   old_chain = save_inferior_ptid ();
   inferior_ptid = BUILD_LWP (lwpid, ph->pid);
-  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
+  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch ());
 
   supply_fpregset (regcache, fpregset);
   target_store_registers (regcache, -1);
@@ -1603,7 +1603,7 @@ ps_lgetxmmregs (struct ps_prochandle *ph
 
   old_chain = save_inferior_ptid ();
   inferior_ptid = BUILD_LWP (lwpid, ph->pid);
-  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
+  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch ());
 
   target_fetch_registers (regcache, -1);
   i387_collect_fxsave (regcache, -1, xmmregs);
@@ -1620,7 +1620,7 @@ ps_lsetxmmregs (struct ps_prochandle *ph
 
   old_chain = save_inferior_ptid ();
   inferior_ptid = BUILD_LWP (lwpid, ph->pid);
-  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch);
+  regcache = get_thread_arch_regcache (inferior_ptid, target_gdbarch ());
 
   i387_supply_fxsave (regcache, -1, xmmregs);
   target_store_registers (regcache, -1);

Added: head/devel/gdb/files/patch-gdb-amd64bsd-nat.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gdb/files/patch-gdb-amd64bsd-nat.c	Thu May 16 17:07:13 2013	(r318323)
@@ -0,0 +1,36 @@
+--- gdb/amd64bsd-nat.c.orig	2013-04-09 16:45:15.000000000 +0200
++++ gdb/amd64bsd-nat.c	2013-04-09 18:53:22.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <sys/types.h>
+ #include <sys/ptrace.h>
+ #include <machine/reg.h>
++#include <machine/psl.h>
+ 
+ #include "amd64-tdep.h"
+ #include "amd64-nat.h"
+@@ -81,14 +82,24 @@
+ 
+   if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, regnum))
+     {
+-      struct reg regs;
++      struct reg regs, oldregs;
+ 
++      memset( &regs, 0, sizeof(struct reg));
++      memset( &oldregs, 0, sizeof(struct reg));
+       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+                   (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+         perror_with_name (_("Couldn't get registers"));
+ 
++      ptrace (PT_GETREGS, PIDGET (inferior_ptid),
++                  (PTRACE_TYPE_ARG3) &oldregs, 0);
+       amd64_collect_native_gregset (regcache, &regs, regnum);
+ 
++      if( (regs.r_rflags ^ oldregs.r_rflags ) & ~PSL_USERCHANGE) {
++        //printf("regs.r_rflags = 0x%8.8lX\n", regs.r_rflags );
++        //printf("oldregs.r_rflags = 0x%8.8lX\n", oldregs.r_rflags );
++        regs.r_rflags ^= (regs.r_rflags ^ oldregs.r_rflags ) & ~PSL_USERCHANGE;
++        //printf("    allowed regs.r_rflags = 0x%8.8X\n", regs.r_rflags );
++      }
+       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
+ 	          (PTRACE_TYPE_ARG3) &regs, 0) == -1)
+         perror_with_name (_("Couldn't write registers"));

Modified: head/devel/gdb/files/patch-gdb-i386fbsd-tdep.c
==============================================================================
--- head/devel/gdb/files/patch-gdb-i386fbsd-tdep.c	Thu May 16 15:10:12 2013	(r318322)
+++ head/devel/gdb/files/patch-gdb-i386fbsd-tdep.c	Thu May 16 17:07:13 2013	(r318323)
@@ -15,7 +15,7 @@
 -i386fbsd_supply_uthread (struct regcache *regcache,
 -			 int regnum, CORE_ADDR addr)
 -{
--  char buf[4];
+-  gdb_byte buf[4];
 -  int i;
 -
 -  gdb_assert (regnum >= -1);
@@ -35,7 +35,7 @@
 -i386fbsd_collect_uthread (const struct regcache *regcache,
 -			  int regnum, CORE_ADDR addr)
 -{
--  char buf[4];
+-  gdb_byte buf[4];
 -  int i;
 -
 -  gdb_assert (regnum >= -1);

Modified: head/devel/gdb/files/patch-opcodes-ia64-asmtab.c
==============================================================================
--- head/devel/gdb/files/patch-opcodes-ia64-asmtab.c	Thu May 16 15:10:12 2013	(r318322)
+++ head/devel/gdb/files/patch-opcodes-ia64-asmtab.c	Thu May 16 17:07:13 2013	(r318323)
@@ -1,37 +1,37 @@
---- opcodes/ia64-asmtab.c.orig	2008-08-28 16:07:49.000000000 +0200
-+++ opcodes/ia64-asmtab.c	2013-03-13 16:40:09.000000000 +0100
-@@ -101,7 +101,7 @@
+--- opcodes/ia64-asmtab.c.orig	2013-04-28 14:55:03.000000000 +0200
++++ opcodes/ia64-asmtab.c	2013-04-28 14:56:48.000000000 +0200
+@@ -102,7 +102,7 @@
    { "CPUID#", 7, 0, 5, -1, NULL, },
-   { "CR[CMCV]", 28, 0, 3, 74, NULL, },
-   { "CR[DCR]", 28, 0, 3, 0, NULL, },
--  { "CR[EOI]", 28, 0, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI Ð CR67)\" on page 2:119", },
-+  { "CR[EOI]", 28, 0, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI CR67)\" on page 2:119", },
-   { "CR[GPTA]", 28, 0, 3, 9, NULL, },
-   { "CR[IFA]", 28, 0, 1, 20, NULL, },
-   { "CR[IFA]", 28, 0, 3, 20, NULL, },
-@@ -123,13 +123,13 @@
-   { "CR[ITM]", 28, 0, 3, 1, NULL, },
-   { "CR[ITV]", 28, 0, 3, 72, NULL, },
-   { "CR[IVA]", 28, 0, 4, 2, NULL, },
--  { "CR[IVR]", 28, 0, 7, 65, "SC Section 5.8.3.2, \"External Interrupt Vector Register (IVR Ð CR65)\" on page 2:118", },
--  { "CR[LID]", 28, 0, 7, 64, "SC Section 5.8.3.1, \"Local ID (LID Ð CR64)\" on page 2:117", },
-+  { "CR[IVR]", 28, 0, 7, 65, "SC Section 5.8.3.2, \"External Interrupt Vector Register (IVR  CR65)\" on page 2:118", },
-+  { "CR[LID]", 28, 0, 7, 64, "SC Section 5.8.3.1, \"Local ID (LID  CR64)\" on page 2:117", },
+   { "CR[CMCV]", 29, 0, 3, 74, NULL, },
+   { "CR[DCR]", 29, 0, 3, 0, NULL, },
+-  { "CR[EOI]", 29, 0, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI Ð CR67)\" on page 2:119", },
++  { "CR[EOI]", 29, 0, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI CR67)\" on page 2:119", },
+   { "CR[GPTA]", 29, 0, 3, 9, NULL, },
+   { "CR[IFA]", 29, 0, 1, 20, NULL, },
+   { "CR[IFA]", 29, 0, 3, 20, NULL, },
+@@ -124,13 +124,13 @@
+   { "CR[ITM]", 29, 0, 3, 1, NULL, },
+   { "CR[ITV]", 29, 0, 3, 72, NULL, },
+   { "CR[IVA]", 29, 0, 4, 2, NULL, },
+-  { "CR[IVR]", 29, 0, 7, 65, "SC Section 5.8.3.2, \"External Interrupt Vector Register (IVR Ð CR65)\" on page 2:118", },
+-  { "CR[LID]", 29, 0, 7, 64, "SC Section 5.8.3.1, \"Local ID (LID Ð CR64)\" on page 2:117", },
++  { "CR[IVR]", 29, 0, 7, 65, "SC Section 5.8.3.2, \"External Interrupt Vector Register (IVR CR65)\" on page 2:118", },
++  { "CR[LID]", 29, 0, 7, 64, "SC Section 5.8.3.1, \"Local ID (LID CR64)\" on page 2:117", },
    { "CR[LRR%], % in 0 - 1", 10, 0, 3, -1, NULL, },
-   { "CR[PMV]", 28, 0, 3, 73, NULL, },
-   { "CR[PTA]", 28, 0, 3, 8, NULL, },
-   { "CR[TPR]", 28, 0, 3, 66, NULL, },
--  { "CR[TPR]", 28, 0, 7, 66, "SC Section 5.8.3.3, \"Task Priority Register (TPR Ð CR66)\" on page 2:119", },
-+  { "CR[TPR]", 28, 0, 7, 66, "SC Section 5.8.3.3, \"Task Priority Register (TPR  CR66)\" on page 2:119", },
-   { "CR[TPR]", 28, 0, 1, 66, NULL, },
+   { "CR[PMV]", 29, 0, 3, 73, NULL, },
+   { "CR[PTA]", 29, 0, 3, 8, NULL, },
+   { "CR[TPR]", 29, 0, 3, 66, NULL, },
+-  { "CR[TPR]", 29, 0, 7, 66, "SC Section 5.8.3.3, \"Task Priority Register (TPR Ð CR66)\" on page 2:119", },
++  { "CR[TPR]", 29, 0, 7, 66, "SC Section 5.8.3.3, \"Task Priority Register (TPR  CR66)\" on page 2:119", },
+   { "CR[TPR]", 29, 0, 1, 66, NULL, },
    { "CR%, % in 3-7, 10-15, 18, 28-63, 75-79, 82-127", 11, 0, 0, -1, NULL, },
-   { "DBR#", 12, 0, 2, -1, NULL, },
-@@ -303,7 +303,7 @@
+   { "DAHR%, % in 0-7", 12, 0, 1, -1, NULL, },
+@@ -305,7 +305,7 @@
    { "CPUID#", 7, 1, 0, -1, NULL, },
-   { "CR[CMCV]", 28, 1, 2, 74, NULL, },
-   { "CR[DCR]", 28, 1, 2, 0, NULL, },
--  { "CR[EOI]", 28, 1, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI Ð CR67)\" on page 2:119", },
-+  { "CR[EOI]", 28, 1, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI  CR67)\" on page 2:119", },
-   { "CR[GPTA]", 28, 1, 2, 9, NULL, },
-   { "CR[IFA]", 28, 1, 2, 20, NULL, },
-   { "CR[IFS]", 28, 1, 2, 23, NULL, },
+   { "CR[CMCV]", 29, 1, 2, 74, NULL, },
+   { "CR[DCR]", 29, 1, 2, 0, NULL, },
+-  { "CR[EOI]", 29, 1, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI Ð CR67)\" on page 2:119", },
++  { "CR[EOI]", 29, 1, 7, 67, "SC Section 5.8.3.4, \"End of External Interrupt Register (EOI CR67)\" on page 2:119", },
+   { "CR[GPTA]", 29, 1, 2, 9, NULL, },
+   { "CR[IFA]", 29, 1, 2, 20, NULL, },
+   { "CR[IFS]", 29, 1, 2, 23, NULL, },

Added: head/devel/gdb/files/patch-opcodes-v850-dis.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gdb/files/patch-opcodes-v850-dis.c	Thu May 16 17:07:13 2013	(r318323)
@@ -0,0 +1,20 @@
+--- opcodes/v850-dis.c.orig	2013-01-24 12:14:05.000000000 +0100
++++ opcodes/v850-dis.c	2013-04-29 10:10:25.000000000 +0200
+@@ -73,7 +73,7 @@
+   "chbwbd", "cibid", "cibiwbd", "cibwbd", "cfald", "cistd", "cildd"
+ };
+ 
+-static const int const v850_cacheop_codes[] =
++static const int v850_cacheop_codes[] =
+ {
+   0x00, 0x20, 0x40, 0x60, 0x61, 0x04, 0x06,
+   0x07, 0x24, 0x26, 0x27, 0x44, 0x64, 0x65, -1
+@@ -82,7 +82,7 @@
+ static const char *const v850_prefop_names[] =
+ { "prefi", "prefd" };
+ 
+-static const int const v850_prefop_codes[] =
++static const int v850_prefop_codes[] =
+ { 0x00, 0x04, -1};
+ 
+ static void
Comment 4 Raphael Kubo da Costa freebsd_committer freebsd_triage 2013-05-16 18:08:12 UTC
State Changed
From-To: open->closed

Committed, at last. The patch was supposed to be encoded as ISO-8859-1, 
but I ended up always fetching it as UTF-8. Thanks!