diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b45492c26b..2a858a1b92 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-04  Kei Sakamoto  <sakamoto.kei@denesas.com>
+	* Makefile.in (m32r-tdep.o): Update dependencies.
+	* m32r-tdep.c (m32r_gdbarch_init): Call gdbarch_init_osabi for
+	ABI-specific overrides.
+
 2004-11-04  Kei Sakamoto  <sakamoto.kei@denesas.com>
 	* m32r-tdep.c (m32r_memory_insert_breakpoint): Remove
 	unnecessary parallel execution bit.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 1f42e7367c..c179641b2b 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2171,7 +2171,7 @@ m32r-tdep.o: m32r-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
 	$(frame_base_h) $(symtab_h) $(gdbtypes_h) $(gdbcmd_h) $(gdbcore_h) \
 	$(gdb_string_h) $(value_h) $(inferior_h) $(symfile_h) $(objfiles_h) \
 	$(language_h) $(arch_utils_h) $(regcache_h) $(trad_frame_h) \
-	$(dis_asm_h) $(gdb_assert_h) $(m32r_tdep_h)
+	$(dis_asm_h) $(gdb_assert_h) $(osabi_h) $(m32r_tdep_h)
 m68hc11-tdep.o: m68hc11-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \
 	$(frame_base_h) $(dwarf2_frame_h) $(trad_frame_h) $(symtab_h) \
 	$(gdbtypes_h) $(gdbcmd_h) $(gdbcore_h) $(gdb_string_h) $(value_h) \
diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index c4497c9941..82ddf30604 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -33,6 +33,7 @@
 #include "inferior.h"
 #include "symfile.h"
 #include "objfiles.h"
+#include "osabi.h"
 #include "language.h"
 #include "arch-utils.h"
 #include "regcache.h"
@@ -938,7 +939,6 @@ m32r_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   set_gdbarch_frame_align (gdbarch, m32r_frame_align);
 
-  frame_unwind_append_sniffer (gdbarch, m32r_frame_sniffer);
   frame_base_set_default (gdbarch, &m32r_frame_base);
 
   /* Methods for saving / extracting a dummy frame's ID.  The ID's
@@ -951,6 +951,12 @@ m32r_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 
   set_gdbarch_print_insn (gdbarch, print_insn_m32r);
 
+  /* Hook in ABI-specific overrides, if they have been registered.  */
+  gdbarch_init_osabi (info, gdbarch);
+
+  /* Hook in the default unwinders.  */
+  frame_unwind_append_sniffer (gdbarch, m32r_frame_sniffer);
+
   return gdbarch;
 }