Fix i386 build.
This commit is contained in:
parent
c59c374ffc
commit
1e7b928d5c
@ -6,11 +6,19 @@ from Alexandre Oliva <aoliva@redhat.com>
|
|||||||
(i386_linux_set_debug_regs_for_thread): ... this, and
|
(i386_linux_set_debug_regs_for_thread): ... this, and
|
||||||
add new function to catch exceptions in the old one.
|
add new function to catch exceptions in the old one.
|
||||||
|
|
||||||
Index: gdb-6.3/gdb/i386-linux-nat.c
|
Index: gdb-6.5/gdb/i386-linux-nat.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gdb-6.3.orig/gdb/i386-linux-nat.c 2006-04-14 03:22:47.000000000 -0300
|
--- gdb-6.5.orig/gdb/i386-linux-nat.c 2006-07-11 05:21:58.000000000 -0300
|
||||||
+++ gdb-6.3/gdb/i386-linux-nat.c 2006-05-27 03:48:47.000000000 -0300
|
+++ gdb-6.5/gdb/i386-linux-nat.c 2006-07-11 05:24:29.000000000 -0300
|
||||||
@@ -694,14 +694,33 @@ struct i386_debug_register_state
|
@@ -27,6 +27,7 @@
|
||||||
|
#include "observer.h"
|
||||||
|
#include "target.h"
|
||||||
|
#include "linux-nat.h"
|
||||||
|
+#include "exceptions.h"
|
||||||
|
|
||||||
|
#include "gdb_assert.h"
|
||||||
|
#include "gdb_string.h"
|
||||||
|
@@ -695,14 +696,33 @@ struct i386_debug_register_state
|
||||||
unsigned long control;
|
unsigned long control;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -37,8 +37,8 @@
|
|||||||
|
|
||||||
Index: gdb-6.5/gdb/config/i386/nm-linux64.h
|
Index: gdb-6.5/gdb/config/i386/nm-linux64.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gdb-6.5.orig/gdb/config/i386/nm-linux64.h 2006-07-11 02:44:36.000000000 -0300
|
--- gdb-6.5.orig/gdb/config/i386/nm-linux64.h 2006-07-11 05:20:42.000000000 -0300
|
||||||
+++ gdb-6.5/gdb/config/i386/nm-linux64.h 2006-07-11 02:45:16.000000000 -0300
|
+++ gdb-6.5/gdb/config/i386/nm-linux64.h 2006-07-11 05:20:44.000000000 -0300
|
||||||
@@ -35,22 +35,59 @@
|
@@ -35,22 +35,59 @@
|
||||||
|
|
||||||
/* Provide access to the i386 hardware debugging registers. */
|
/* Provide access to the i386 hardware debugging registers. */
|
||||||
@ -109,8 +109,8 @@ Index: gdb-6.5/gdb/config/i386/nm-linux64.h
|
|||||||
#define FETCH_INFERIOR_REGISTERS
|
#define FETCH_INFERIOR_REGISTERS
|
||||||
Index: gdb-6.5/gdb/config/i386/nm-linux.h
|
Index: gdb-6.5/gdb/config/i386/nm-linux.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gdb-6.5.orig/gdb/config/i386/nm-linux.h 2006-07-11 02:44:36.000000000 -0300
|
--- gdb-6.5.orig/gdb/config/i386/nm-linux.h 2006-07-11 05:20:42.000000000 -0300
|
||||||
+++ gdb-6.5/gdb/config/i386/nm-linux.h 2006-07-11 02:45:16.000000000 -0300
|
+++ gdb-6.5/gdb/config/i386/nm-linux.h 2006-07-11 05:20:44.000000000 -0300
|
||||||
@@ -46,23 +46,61 @@ extern CORE_ADDR register_u_addr (CORE_A
|
@@ -46,23 +46,61 @@ extern CORE_ADDR register_u_addr (CORE_A
|
||||||
|
|
||||||
/* Provide access to the i386 hardware debugging registers. */
|
/* Provide access to the i386 hardware debugging registers. */
|
||||||
@ -183,8 +183,8 @@ Index: gdb-6.5/gdb/config/i386/nm-linux.h
|
|||||||
|
|
||||||
Index: gdb-6.5/gdb/i386-nat.c
|
Index: gdb-6.5/gdb/i386-nat.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gdb-6.5.orig/gdb/i386-nat.c 2006-07-11 02:44:36.000000000 -0300
|
--- gdb-6.5.orig/gdb/i386-nat.c 2006-07-11 05:20:42.000000000 -0300
|
||||||
+++ gdb-6.5/gdb/i386-nat.c 2006-07-11 02:45:16.000000000 -0300
|
+++ gdb-6.5/gdb/i386-nat.c 2006-07-11 05:20:44.000000000 -0300
|
||||||
@@ -21,6 +21,7 @@
|
@@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include "defs.h"
|
#include "defs.h"
|
||||||
@ -196,7 +196,7 @@ Index: gdb-6.5/gdb/i386-nat.c
|
|||||||
Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c
|
Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||||
+++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c 2006-07-11 02:45:16.000000000 -0300
|
+++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c 2006-07-11 05:20:44.000000000 -0300
|
||||||
@@ -0,0 +1,66 @@
|
@@ -0,0 +1,66 @@
|
||||||
+/* This testcase is part of GDB, the GNU debugger.
|
+/* This testcase is part of GDB, the GNU debugger.
|
||||||
+
|
+
|
||||||
@ -267,7 +267,7 @@ Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.c
|
|||||||
Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp
|
Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||||
+++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp 2006-07-11 02:45:16.000000000 -0300
|
+++ gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp 2006-07-11 05:20:44.000000000 -0300
|
||||||
@@ -0,0 +1,133 @@
|
@@ -0,0 +1,133 @@
|
||||||
+# This testcase is part of GDB, the GNU debugger.
|
+# This testcase is part of GDB, the GNU debugger.
|
||||||
+
|
+
|
||||||
@ -404,8 +404,8 @@ Index: gdb-6.5/gdb/testsuite/gdb.threads/watchthreads2.exp
|
|||||||
+}
|
+}
|
||||||
Index: gdb-6.5/gdb/i386-linux-nat.c
|
Index: gdb-6.5/gdb/i386-linux-nat.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gdb-6.5.orig/gdb/i386-linux-nat.c 2006-07-11 02:44:36.000000000 -0300
|
--- gdb-6.5.orig/gdb/i386-linux-nat.c 2006-07-11 05:20:42.000000000 -0300
|
||||||
+++ gdb-6.5/gdb/i386-linux-nat.c 2006-07-11 02:45:16.000000000 -0300
|
+++ gdb-6.5/gdb/i386-linux-nat.c 2006-07-11 05:21:58.000000000 -0300
|
||||||
@@ -24,6 +24,7 @@
|
@@ -24,6 +24,7 @@
|
||||||
#include "inferior.h"
|
#include "inferior.h"
|
||||||
#include "gdbcore.h"
|
#include "gdbcore.h"
|
||||||
@ -580,7 +580,7 @@ Index: gdb-6.5/gdb/i386-linux-nat.c
|
|||||||
+i386_linux_insert_hw_breakpoint (struct bp_target_info *bp_tgt)
|
+i386_linux_insert_hw_breakpoint (struct bp_target_info *bp_tgt)
|
||||||
+{
|
+{
|
||||||
+ int rc;
|
+ int rc;
|
||||||
+ rc = i386_insert_hw_breakpoint (bt_tgt);
|
+ rc = i386_insert_hw_breakpoint (bp_tgt);
|
||||||
+ if (!rc)
|
+ if (!rc)
|
||||||
+ i386_linux_sync_debug_registers_across_threads ();
|
+ i386_linux_sync_debug_registers_across_threads ();
|
||||||
+ return rc;
|
+ return rc;
|
||||||
@ -616,21 +616,17 @@ Index: gdb-6.5/gdb/i386-linux-nat.c
|
|||||||
/* Called by libthread_db. Returns a pointer to the thread local
|
/* Called by libthread_db. Returns a pointer to the thread local
|
||||||
storage (or its descriptor). */
|
storage (or its descriptor). */
|
||||||
|
|
||||||
@@ -844,3 +969,10 @@ _initialize_i386_linux_nat (void)
|
@@ -843,4 +968,6 @@ _initialize_i386_linux_nat (void)
|
||||||
|
|
||||||
/* Register the target. */
|
/* Register the target. */
|
||||||
linux_nat_add_target (t);
|
linux_nat_add_target (t);
|
||||||
}
|
|
||||||
+
|
+
|
||||||
+void
|
|
||||||
+_initialize_i386_linux_nat (void)
|
|
||||||
+{
|
|
||||||
+ observer_attach_linux_new_thread (i386_linux_new_thread);
|
+ observer_attach_linux_new_thread (i386_linux_new_thread);
|
||||||
+}
|
}
|
||||||
+
|
|
||||||
Index: gdb-6.5/gdb/amd64-linux-nat.c
|
Index: gdb-6.5/gdb/amd64-linux-nat.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- gdb-6.5.orig/gdb/amd64-linux-nat.c 2006-07-11 02:44:36.000000000 -0300
|
--- gdb-6.5.orig/gdb/amd64-linux-nat.c 2006-07-11 05:20:42.000000000 -0300
|
||||||
+++ gdb-6.5/gdb/amd64-linux-nat.c 2006-07-11 02:45:16.000000000 -0300
|
+++ gdb-6.5/gdb/amd64-linux-nat.c 2006-07-11 05:20:44.000000000 -0300
|
||||||
@@ -25,6 +25,7 @@
|
@@ -25,6 +25,7 @@
|
||||||
#include "inferior.h"
|
#include "inferior.h"
|
||||||
#include "gdbcore.h"
|
#include "gdbcore.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user