* sparc64-linux-tdep.c (sparc64_linux_init_abi): Append dwarf2

	frame sniffer.
	* sparc-tdep.c (sparc32_gdbarch_init): Make sure to call
	dwarf2_frame_set_init_reg() before gdbarch_init_osabi() so
	that the latter can override.
	* Makefile.in (sparc64-linux-tdep.o): Update dependencies.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2d4285ac567bb93c0152ebf2509ece52cc9fbbb8..23f938b77d8ddeef11223d93e3f0b1a283652a90 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-09  David S. Miller  <davem@sunset.davemloft.net>
+
+       * sparc64-linux-tdep.c (sparc64_linux_init_abi): Append dwarf2
+       frame sniffer.
+       * sparc-tdep.c (sparc32_gdbarch_init): Make sure to call
+       dwarf2_frame_set_init_reg() before gdbarch_init_osabi() so
+       that the latter can override.
+       * Makefile.in (sparc64-linux-tdep.o): Update dependencies.
+
 2006-04-09  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * s390-tdep.c (struct s390_prologue_data): New field 'stack'.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 3c568dddcc8ae278d9cbf78119a5d7a5a858a759..beab57cd730a994bd59f7620c11fae9918d231c5 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2618,9 +2618,9 @@ sparc64-linux-nat.o: sparc64-linux-nat.c $(defs_h) $(regcache_h) \
        $(gregset_h) $(sparc64_tdep_h) $(sparc_tdep_h) \
        $(sparc_nat_h) $(inferior_h) $(target_h) $(linux_nat_h)
 sparc64-linux-tdep.o: sparc64-linux-tdep.c $(defs_h) $(frame_h) \
-       $(frame_unwind_h) $(regset_h) $(regcache_h) $(gdbarch_h) \
-       $(gdbcore_h) $(osabi_h) $(solib_svr4_h) $(symtab_h) $(trad_frame_h) \
-       $(tramp_frame_h) $(sparc64_tdep_h)
+       $(frame_unwind_h) $(dwarf2-frame_h) $(regset_h) $(regcache_h) \
+       $(gdbarch_h) $(gdbcore_h) $(osabi_h) $(solib_svr4_h) $(symtab_h) \
+       $(trad_frame_h) $(tramp_frame_h) $(sparc64_tdep_h)
 sparc64-nat.o: sparc64-nat.c $(defs_h) $(gdbarch_h) $(sparc64_tdep_h) \
        $(sparc_nat_h)
 sparc64nbsd-nat.o: sparc64nbsd-nat.c $(defs_h) $(regcache_h) $(target_h) \

diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index e3b1ccfd43725a8e21a160847af2f9041ea28433..77169a7a4d8b796419120f609488f84592033fbf 100644 (file)
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -1296,14 +1296,14 @@ sparc32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   frame_base_set_default (gdbarch, &sparc32_frame_base);
 
-  /* Hook in ABI-specific overrides, if they have been registered.  */
-  gdbarch_init_osabi (info, gdbarch);
-
   /* Hook in the DWARF CFI frame unwinder.  */
   dwarf2_frame_set_init_reg (gdbarch, sparc32_dwarf2_frame_init_reg);
   /* FIXME: kettenis/20050423: Don't enable the unwinder until the
      StackGhost issues have been resolved.  */
 
+  /* Hook in ABI-specific overrides, if they have been registered.  */
+  gdbarch_init_osabi (info, gdbarch);
+
   frame_unwind_append_sniffer (gdbarch, sparc32_frame_sniffer);
 
   /* If we have register sets, enable the generic core file support.  */

diff --git a/gdb/sparc64-linux-tdep.c b/gdb/sparc64-linux-tdep.c
index dd3b622a9595fd9b8bfae115b6c933b0fc20336b..850f04542bf4bafb0ebf03f5d1dc8882af03d077 100644 (file)
--- a/gdb/sparc64-linux-tdep.c
+++ b/gdb/sparc64-linux-tdep.c
@@ -22,6 +22,7 @@
 #include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
+#include "dwarf2-frame.h"
 #include "regset.h"
 #include "regcache.h"
 #include "gdbarch.h"
@@ -195,6 +196,9 @@ sparc64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   tramp_frame_prepend_unwinder (gdbarch, &sparc64_linux_rt_sigframe);
 
+  /* Hook in the DWARF CFI frame unwinder.  */
+  frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer);
+
   sparc64_init_abi (info, gdbarch);
 
   /* GNU/Linux has SVR4-style shared libraries...  */