2003-08-28  Daniel Jacobowitz  <drow@mvista.com>

	* arm-tdep.c: Include "dwarf2-frame.h".
	(arm_gdbarch_init): Use dwarf2_frame_sniffer.
	* Makefile.in (arm-tdep.o): Update dependencies.

Index: gdb/arm-tdep.c
===================================================================
--- gdb.orig/arm-tdep.c	2003-08-28 21:13:46.000000000 -0400
+++ gdb/arm-tdep.c	2003-08-28 21:13:46.000000000 -0400
@@ -37,6 +37,7 @@
 #include "frame-unwind.h"
 #include "frame-base.h"
 #include "trad-frame.h"
+#include "dwarf2-frame.h"
 
 #include "arm-tdep.h"
 #include "gdb/sim-arm.h"
@@ -2912,8 +2913,15 @@ arm_gdbarch_init (struct gdbarch_info in
   /* Hook in the ABI-specific overrides, if they have been registered.  */
   gdbarch_init_osabi (info, gdbarch);
 
-  /* Add some default predicates.  */
+  /* Add some default frame sniffers.  */
+
   frame_unwind_append_sniffer (gdbarch, arm_sigtramp_unwind_sniffer);
+
+  /* Hook in the DWARF CFI frame unwinder.  We do not use dwarf2 for frame
+     bases because it has the crazy idea that the frame base should be the
+     CFA.  */
+  frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer);
+
   frame_unwind_append_sniffer (gdbarch, arm_prologue_unwind_sniffer);
 
   /* Now we have tuned the configuration, set a few final things,
Index: gdb/Makefile.in
===================================================================
--- gdb.orig/Makefile.in	2003-08-28 21:13:46.000000000 -0400
+++ gdb/Makefile.in	2003-08-28 21:13:46.000000000 -0400
@@ -1587,7 +1587,7 @@ arm-tdep.o: arm-tdep.c $(defs_h) $(frame
 	$(doublest_h) $(value_h) $(arch_utils_h) $(osabi_h) $(arm_tdep_h) \
 	$(gdb_sim_arm_h) $(elf_bfd_h) $(coff_internal_h) $(elf_arm_h) \
 	$(gdb_assert_h) $(bfd_in2_h) $(libcoff_h) $(frame_unwind_h) \
-	$(trad_frame_h) $(frame_base_h)
+	$(trad_frame_h) $(frame_base_h) $(dwarf2_frame_h)
 avr-tdep.o: avr-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
 	$(frame_base_h) $(trad_frame_h) $(gdbcmd_h) $(gdbcore_h) \
 	$(inferior_h) $(symfile_h) $(arch_utils_h) $(regcache_h) \