Page MenuHomeFreeBSD

D13977.diff
No OneTemporary

D13977.diff

Index: head/devel/gdb/Makefile
===================================================================
--- head/devel/gdb/Makefile
+++ head/devel/gdb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gdb
PORTVERSION= 8.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= GNU
Index: head/devel/gdb/files/kgdb/aarch64-fbsd-kern.c
===================================================================
--- head/devel/gdb/files/kgdb/aarch64-fbsd-kern.c
+++ head/devel/gdb/files/kgdb/aarch64-fbsd-kern.c
@@ -45,9 +45,9 @@
static const struct regcache_map_entry aarch64_fbsd_pcbmap[] =
{
{ 30, AARCH64_X0_REGNUM, 8 }, /* x0 ... x29 */
- { 1, AARCH64_LR_REGNUM, 8 },
- { 1, AARCH64_SP_REGNUM, 8 },
{ 1, AARCH64_PC_REGNUM, 8 },
+ { 1, REGCACHE_MAP_SKIP, 8 },
+ { 1, AARCH64_SP_REGNUM, 8 },
{ 0 }
};
@@ -100,7 +100,7 @@
trad_frame_set_reg_addr (cache, AARCH64_PC_REGNUM, sp + 16);
trad_frame_set_reg_addr (cache, AARCH64_CPSR_REGNUM, sp + 24);
for (i = 0; i < 30; i++)
- trad_frame_set_reg_addr (cache, AARCH64_X0_REGNUM + 1, sp + 32 + i * 8);
+ trad_frame_set_reg_addr (cache, AARCH64_X0_REGNUM + i, sp + 32 + i * 8);
/* Read $PC from trap frame. */
pc = read_memory_unsigned_integer (sp + 16, 8, byte_order);
@@ -149,9 +149,9 @@
find_pc_partial_function (get_frame_func (this_frame), &name, NULL, NULL);
return (name && ((strcmp (name, "handle_el1h_sync") == 0)
|| (strcmp (name, "handle_el1h_irq") == 0)
- || (strcmp (name, "handle_el0h_sync") == 0)
- || (strcmp (name, "handle_el0h_irq") == 0)
- || (strcmp (name, "handle_el0h_error") == 0)
+ || (strcmp (name, "handle_el0_sync") == 0)
+ || (strcmp (name, "handle_el0_irq") == 0)
+ || (strcmp (name, "handle_el0_error") == 0)
|| (strcmp (name, "fork_trampoline") == 0)));
}
Index: head/devel/gdb/files/kgdb/amd64fbsd-kern.c
===================================================================
--- head/devel/gdb/files/kgdb/amd64fbsd-kern.c
+++ head/devel/gdb/files/kgdb/amd64fbsd-kern.c
@@ -205,6 +205,7 @@
find_pc_partial_function (get_frame_func (this_frame), &name, NULL, NULL);
return (name && ((strcmp (name, "calltrap") == 0)
|| (strcmp (name, "fork_trampoline") == 0)
+ || (strcmp (name, "mchk_calltrap") == 0)
|| (strcmp (name, "nmi_calltrap") == 0)
|| (name[0] == 'X' && name[1] != '_')));
}
Index: head/devel/gdb/files/kgdb/fbsd-kld.c
===================================================================
--- head/devel/gdb/files/kgdb/fbsd-kld.c
+++ head/devel/gdb/files/kgdb/fbsd-kld.c
@@ -27,8 +27,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include <sys/param.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include <libgen.h>

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 27, 4:30 AM (11 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15611173
Default Alt Text
D13977.diff (2 KB)

Event Timeline