* gdbtypes.c (built_gdbtypes): Don't set builtin_type_void here.

	(_initialize_gdbtypes): Do it here, and don't swap it when the
	architecture changes.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 131611b..f0a6438 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-05  Jim Blandy  <jimb@codesourcery.com>
+
+       * gdbtypes.c (built_gdbtypes): Don't set builtin_type_void here.
+       (_initialize_gdbtypes): Do it here, and don't swap it when the
+       architecture changes.
+
 2006-12-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * cp-valprint.c, p-valprint.c: Revert last change.

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 4c9f047..3ce38ff 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -3297,10 +3297,6 @@ copy_type_recursive (struct objfile *objfile, struct type *type,
 static void
 build_gdbtypes (void)
 {
-  builtin_type_void =
-    init_type (TYPE_CODE_VOID, 1,
-              0,
-              "void", (struct objfile *) NULL);
   builtin_type_char =
     init_type (TYPE_CODE_INT, TARGET_CHAR_BIT / TARGET_CHAR_BIT,
               (TYPE_FLAG_NOSIGN
@@ -3650,6 +3646,10 @@ _initialize_gdbtypes (void)
 {
   struct cmd_list_element *c;
 
+  builtin_type_void =
+    init_type (TYPE_CODE_VOID, 1,
+              0,
+              "void", (struct objfile *) NULL);
   builtin_type_int0 =
     init_type (TYPE_CODE_INT, 0 / 8,
               0,
@@ -3702,7 +3702,6 @@ _initialize_gdbtypes (void)
   /* FIXME - For the moment, handle types by swapping them in and out.
      Should be using the per-architecture data-pointer and a large
      struct. */
-  DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_void);
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_char);
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_short);
   DEPRECATED_REGISTER_GDBARCH_SWAP (builtin_type_int);