* gdbarch.sh: Changes to effect the following:

* gdbarch.c (initialize_non_multiarch): New function.
* gdbarch.h (initialize_non_multiarch): New declaration.
* arch-utils.c (initialize_current_architecture): For
non-multiarch configurations, call initialize_non_multiarch.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a7be1b1ef89c7ca3f7aef0cc074c7083fed675ab..5369a9357678e6a3e4a8e7798bcf59730151ec82 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-06  Jim Blandy  <jimb@redhat.com>
+
+       * gdbarch.sh: Changes to effect the following:
+       * gdbarch.c (initialize_non_multiarch): New function.
+       * gdbarch.h (initialize_non_multiarch): New declaration.
+       * arch-utils.c (initialize_current_architecture): For
+       non-multiarch configurations, call initialize_non_multiarch.
+
 2001-06-06  Andrew Cagney  <ac131313@redhat.com>
 
        * symfile.c (compare_psymbols): Replace PTR with void*. Delete

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 733b2b96d02f3228fd67a84279ad6a08e3dc6490..46970013eb29df57f10dac11ad976c5898e2c476 100644 (file)
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -705,6 +705,8 @@ initialize_current_architecture (void)
                          "initialize_current_architecture: Selection of initial architecture failed");
        }
     }
+  else
+    initialize_non_multiarch ();
 
   /* Create the ``set architecture'' command appending ``auto'' to the
      list of architectures. */

diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 2bd957f6e018a66e80b7a73eb9c195a8b413a91a..95e9044a4763227bfd2fb49e3cfe6d17c7f677dc 100644 (file)
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -387,6 +387,15 @@ struct gdbarch startup_gdbarch =
 
 struct gdbarch *current_gdbarch = &startup_gdbarch;
 
+/* Do any initialization needed for a non-multiarch configuration
+   after the _initialize_MODULE functions have been run.  */
+void
+initialize_non_multiarch ()
+{
+  alloc_gdbarch_data (&startup_gdbarch);
+  init_gdbarch_data (&startup_gdbarch);
+}
+
 
 /* Create a new ``struct gdbarch'' based on information provided by
    ``struct gdbarch_info''. */

diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 5b2bcacdfd504785a4ef4e59f9688c92e918ec2b..2e9d35f28ecf1108044595e6132d998a6aae0931 100644 (file)
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -1834,6 +1834,10 @@ extern void set_gdbarch_from_file (bfd *);
 
 extern void initialize_current_architecture (void);
 
+/* For non-multiarched targets, do any initialization of the default
+   gdbarch object necessary after the _initialize_MODULE functions
+   have run.  */
+extern void initialize_non_multiarch ();
 
 /* gdbarch trace variable */
 extern int gdbarch_debug;

diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 14e88c30a83f12724de977dca7877379427805f9..57b1ab02339da6220fd818794b50b74514f0f6c2 100755 (executable)
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1065,6 +1065,10 @@ extern void set_gdbarch_from_file (bfd *);
 
 extern void initialize_current_architecture (void);
 
+/* For non-multiarched targets, do any initialization of the default
+   gdbarch object necessary after the _initialize_MODULE functions
+   have run.  */
+extern void initialize_non_multiarch ();
 
 /* gdbarch trace variable */
 extern int gdbarch_debug;
@@ -1246,6 +1250,15 @@ cat <<EOF
 };
 
 struct gdbarch *current_gdbarch = &startup_gdbarch;
+
+/* Do any initialization needed for a non-multiarch configuration
+   after the _initialize_MODULE functions have been run.  */
+void
+initialize_non_multiarch ()
+{
+  alloc_gdbarch_data (&startup_gdbarch);
+  init_gdbarch_data (&startup_gdbarch);
+}
 EOF
 
 # Create a new gdbarch struct