75eaddb
2004-06-21  Andrew Cagney  <cagney@gnu.org>
75eaddb
75eaddb
	* i386-tdep.c (i386_gdbarch_init): Move the the dwarf2-frame
75eaddb
	sniffer registration to after the signal trampoline frame sniffer.
75eaddb
	* amd64-tdep.c (amd64_init_abi): Include "dwarf2-frame.h".
75eaddb
	Register the dwarf2-frame sniffer, but after the signal trampoline
75eaddb
	sniffer.
75eaddb
	
75eaddb
Index: ./gdb/amd64-tdep.c
75eaddb
===================================================================
75eaddb
RCS file: /cvs/src/src/gdb/amd64-tdep.c,v
75eaddb
retrieving revision 1.15
75eaddb
diff -p -u -r1.15 amd64-tdep.c
75eaddb
--- ./gdb/amd64-tdep.c	7 Jun 2004 02:02:45 -0000	1.15
75eaddb
+++ ./gdb/amd64-tdep.c	21 Jun 2004 20:16:34 -0000
75eaddb
@@ -34,7 +34,7 @@
75eaddb
 #include "regcache.h"
75eaddb
 #include "regset.h"
75eaddb
 #include "symfile.h"
75eaddb
-
75eaddb
+#include "dwarf2-frame.h"
75eaddb
 #include "gdb_assert.h"
75eaddb
 
75eaddb
 #include "amd64-tdep.h"
75eaddb
@@ -1171,6 +1171,8 @@ amd64_init_abi (struct gdbarch_info info
75eaddb
   set_gdbarch_in_solib_call_trampoline (gdbarch, in_plt_section);
75eaddb
 
75eaddb
   frame_unwind_append_sniffer (gdbarch, amd64_sigtramp_frame_sniffer);
75eaddb
+  /* Hook in the DWARF CFI frame unwinder after sigtramp.  */
75eaddb
+  frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer);
75eaddb
   frame_unwind_append_sniffer (gdbarch, amd64_frame_sniffer);
75eaddb
   frame_base_set_default (gdbarch, &amd64_frame_base);
75eaddb
 
75eaddb
Index: ./gdb/i386-tdep.c
75eaddb
===================================================================
75eaddb
RCS file: /cvs/src/src/gdb/i386-tdep.c,v
75eaddb
retrieving revision 1.197
75eaddb
diff -p -u -r1.197 i386-tdep.c
75eaddb
--- ./gdb/i386-tdep.c	18 Jun 2004 16:06:24 -0000	1.197
75eaddb
+++ ./gdb/i386-tdep.c	21 Jun 2004 20:16:34 -0000
75eaddb
@@ -2131,15 +2131,14 @@ i386_gdbarch_init (struct gdbarch_info i
75eaddb
   /* Helper for function argument information.  */
75eaddb
   set_gdbarch_fetch_pointer_argument (gdbarch, i386_fetch_pointer_argument);
75eaddb
 
75eaddb
-  /* Hook in the DWARF CFI frame unwinder.  */
75eaddb
-  frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer);
75eaddb
-
75eaddb
   frame_base_set_default (gdbarch, &i386_frame_base);
75eaddb
 
75eaddb
   /* Hook in ABI-specific overrides, if they have been registered.  */
75eaddb
   gdbarch_init_osabi (info, gdbarch);
75eaddb
 
75eaddb
   frame_unwind_append_sniffer (gdbarch, i386_sigtramp_frame_sniffer);
75eaddb
+  /* Hook in the DWARF CFI frame unwinder after sigtramp.  */
75eaddb
+  frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer);
75eaddb
   frame_unwind_append_sniffer (gdbarch, i386_frame_sniffer);
75eaddb
 
75eaddb
   /* If we have a register mapping, enable the generic core file