* i386-tdep.c: Include "dwarf2-frame.h".

(i386_gdbarch_init): Hook in the DWARF CFI frame unwinder.
* Makefile.in (i386-tdep.o): Update dependencies.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b98bdeb1836156d916ad911112c3c91aa03d1a61..e7fd71cda56c071d0bb7d36f8d4ea5767b76e2fb 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2003-05-31  Mark Kettenis  <kettenis@gnu.org>
 
+       * i386-tdep.c: Include "dwarf2-frame.h".
+       (i386_gdbarch_init): Hook in the DWARF CFI frame unwinder.
+       * Makefile.in (i386-tdep.o): Update dependencies.
+
        * dwarf2-frame.c, dwarf2-frame.h: New files.
        * Makefile.in (SFILES): Add dwarf2-frame.c.
        (dwarf2_frame_h): Define.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 26461f91e3ade115f30c0a0dee40af951c66e2e9..55e02041c6d19f9d57214ed3c6b8dc595b8ceeef 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1798,11 +1798,11 @@ i386-sol2-tdep.o: i386-sol2-tdep.c $(defs_h) $(value_h) $(i386_tdep_h) \
        $(osabi_h)
 i386-stub.o: i386-stub.c
 i386-tdep.o: i386-tdep.c $(defs_h) $(arch_utils_h) $(command_h) \
-       $(dummy_frame_h) $(doublest_h) $(floatformat_h) $(frame_h) \
-       $(frame_base_h) $(frame_unwind_h) $(inferior_h) $(gdbcmd_h) \
-       $(gdbcore_h) $(objfiles_h) $(osabi_h) $(regcache_h) $(reggroups_h) \
-       $(symfile_h) $(symtab_h) $(target_h) $(value_h) $(gdb_assert_h) \
-       $(gdb_string_h) $(i386_tdep_h) $(i387_tdep_h)
+       $(dummy_frame_h) $(dwarf2_frame_h) $(doublest_h) $(floatformat_h) \
+       $(frame_h) $(frame_base_h) $(frame_unwind_h) $(inferior_h) \
+       $(gdbcmd_h) $(gdbcore_h) $(objfiles_h) $(osabi_h) $(regcache_h) \
+       $(reggroups_h) $(symfile_h) $(symtab_h) $(target_h) $(value_h) \
+       $(gdb_assert_h) $(gdb_string_h) $(i386_tdep_h) $(i387_tdep_h)
 i386b-nat.o: i386b-nat.c $(defs_h)
 i386bsd-nat.o: i386bsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
        $(gdb_assert_h) $(gregset_h) $(i386_tdep_h) $(i387_tdep_h) \

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index c03df8e7435de9709ccbae4557465f74ebcb10dd..65a645ab0da5d5bacc376138d442815a03d2b623 100644 (file)
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -24,6 +24,7 @@
 #include "arch-utils.h"
 #include "command.h"
 #include "dummy-frame.h"
+#include "dwarf2-frame.h"
 #include "doublest.h"
 #include "floatformat.h"
 #include "frame.h"
@@ -1714,6 +1715,10 @@ i386_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   i386_add_reggroups (gdbarch);
   set_gdbarch_register_reggroup_p (gdbarch, i386_register_reggroup_p);
 
+  /* Hook in the DWARF CFI frame unwinder.  */
+  frame_unwind_append_predicate (gdbarch, dwarf2_frame_p);
+  set_gdbarch_dwarf2_build_frame_info (gdbarch, dwarf2_build_frame_info);
+
   frame_base_set_default (gdbarch, &i386_frame_base);
 
   /* Hook in ABI-specific overrides, if they have been registered.  */