diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 01b00bf8cf..59c7883fda 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-05  Daniel Jacobowitz  <drow@mvista.com>
+
+	* gdbarch.sh (initialize_non_multiarch): Call init_gdbarch_swap.
+	* gdbarch.c: Regenerate.
+
 2002-04-05  Michael Snyder  <msnyder@redhat.com>
 
 	* cli/cli-dump.c (restore_section_callback): Use paddr_nz.
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 34ca091bc0..f499b0036c 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -410,6 +410,7 @@ void
 initialize_non_multiarch ()
 {
   alloc_gdbarch_data (&startup_gdbarch);
+  init_gdbarch_swap (&startup_gdbarch)
   init_gdbarch_data (&startup_gdbarch);
 }
 
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 46c44b749f..3844436776 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1332,6 +1332,7 @@ void
 initialize_non_multiarch ()
 {
   alloc_gdbarch_data (&startup_gdbarch);
+  init_gdbarch_swap (&startup_gdbarch)
   init_gdbarch_data (&startup_gdbarch);
 }
 EOF