+2020-04-18  Tom Tromey  <tom@tromey.com>
+
+       * windows-tdep.c (init_w32_command_list)
+       (w32_prefix_command_valid): Restore.
+       (_initialize_windows_tdep): Call init_w32_command_list.
+
 2020-04-18  Tom Tromey  <tom@tromey.com>
 
        * xcoffread.c (enter_line_range, scan_xcoff_symtab): Update.
 
                            "Thread Information Block is %s.\n"), value);
 }
 
+
+static int w32_prefix_command_valid = 0;
+void
+init_w32_command_list (void)
+{
+  if (!w32_prefix_command_valid)
+    {
+      add_basic_prefix_cmd
+       ("w32", class_info,
+        _("Print information specific to Win32 debugging."),
+        &info_w32_cmdlist, "info w32 ", 0, &infolist);
+      w32_prefix_command_valid = 1;
+    }
+}
+
 /* Implementation of `gdbarch_gdb_signal_to_target' for Windows.  */
 
 static int
   windows_gdbarch_data_handle
     = gdbarch_data_register_post_init (init_windows_gdbarch_data);
 
-  add_basic_prefix_cmd ("w32", class_info,
-                       _("Print information specific to Win32 debugging."),
-                       &info_w32_cmdlist, "info w32 ", 0, &infolist);
-
+  init_w32_command_list ();
   add_cmd ("thread-information-block", class_info, display_tib,
           _("Display thread information block."),
           &info_w32_cmdlist);