Remove register_gdbarch_init

This removes the deprecated register_gdbarch_init in favor a default
argument to gdbarch_register.  Regression tested on x86-64 Fedora 34.

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 9c6b9268a696333940e9d0d682c9d9268e1ac593..9bd4f0ddae66e8bbbc30e70cdd35b7e901bb2780 100644 (file)
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -1277,7 +1277,7 @@ gdbarch_register (enum bfd_architecture bfd_architecture,
     }
   /* log it */
   if (gdbarch_debug)
-    gdb_printf (gdb_stdlog, "register_gdbarch_init (%s, %s)\n",
+    gdb_printf (gdb_stdlog, "gdbarch_register (%s, %s)\n",
                bfd_arch_info->printable_name,
                host_address_to_string (init));
   /* Append it */
@@ -1289,14 +1289,6 @@ gdbarch_register (enum bfd_architecture bfd_architecture,
   (*curr)->next = NULL;
 }
 
-void
-register_gdbarch_init (enum bfd_architecture bfd_architecture,
-                      gdbarch_init_ftype *init)
-{
-  gdbarch_register (bfd_architecture, init, NULL);
-}
-
-
 /* Look for an architecture using gdbarch_info.  */
 
 struct gdbarch_list *

diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 357f5bb8f2dc4c5954a9a1a3a3160d881d7b1098..693d563b911d540f62587377b1787ffcb9ad459b 100644 (file)
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -1633,7 +1633,7 @@ void _initialize_avr_tdep ();
 void
 _initialize_avr_tdep ()
 {
-  register_gdbarch_init (bfd_arch_avr, avr_gdbarch_init);
+  gdbarch_register (bfd_arch_avr, avr_gdbarch_init);
 
   /* Add a new command to allow the user to query the avr remote target for
      the values of the io space registers in a saner way than just using

diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index f232e22c37c216d476f764fe927fd37e19b448a3..3e801a982a8442e1635f131bed099b4990be33a6 100644 (file)
--- a/gdb/bfin-tdep.c
+++ b/gdb/bfin-tdep.c
@@ -842,5 +842,5 @@ void _initialize_bfin_tdep ();
 void
 _initialize_bfin_tdep ()
 {
-  register_gdbarch_init (bfd_arch_bfin, bfin_gdbarch_init);
+  gdbarch_register (bfd_arch_bfin, bfin_gdbarch_init);
 }

diff --git a/gdb/bpf-tdep.c b/gdb/bpf-tdep.c
index a5df478063ccbd5b189e9523ea2cd3c1413a14f8..4c08509363267c0c177c8246d9dc835a5fa5888d 100644 (file)
--- a/gdb/bpf-tdep.c
+++ b/gdb/bpf-tdep.c
@@ -374,7 +374,7 @@ void _initialize_bpf_tdep ();
 void
 _initialize_bpf_tdep ()
 {
-  register_gdbarch_init (bfd_arch_bpf, bpf_gdbarch_init);
+  gdbarch_register (bfd_arch_bpf, bpf_gdbarch_init);
 
   /* Add commands 'set/show debug bpf'.  */
   add_setshow_zuinteger_cmd ("bpf", class_maintenance,

diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index 01d4a0f28cb0bfcb9114b587f1f99e8c6d404bfb..ba53c1b10cac4ebf3556077ea635bacab332168b 100644 (file)
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -3053,7 +3053,7 @@ void
 _initialize_csky_tdep ()
 {
 
-  register_gdbarch_init (bfd_arch_csky, csky_gdbarch_init);
+  gdbarch_register (bfd_arch_csky, csky_gdbarch_init);
 
   csky_init_reggroup ();
 

diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index 55a6cfd96180708af6c6010bb846f64c146b3fa6..8029080c0435b12e665bec6974dcb7678e79c7a1 100644 (file)
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -1575,5 +1575,5 @@ void _initialize_frv_tdep ();
 void
 _initialize_frv_tdep ()
 {
-  register_gdbarch_init (bfd_arch_frv, frv_gdbarch_init);
+  gdbarch_register (bfd_arch_frv, frv_gdbarch_init);
 }

diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c
index 024ca47ce4d530c663bc1293b616e8f694a77995..500c691aa34ec46b821f0c121efcca8d687f108e 100644 (file)
--- a/gdb/ft32-tdep.c
+++ b/gdb/ft32-tdep.c
@@ -625,5 +625,5 @@ void _initialize_ft32_tdep ();
 void
 _initialize_ft32_tdep ()
 {
-  register_gdbarch_init (bfd_arch_ft32, ft32_gdbarch_init);
+  gdbarch_register (bfd_arch_ft32, ft32_gdbarch_init);
 }

diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 2c431a34735562c20d1e427a8957b0c512726cef..9ac418150b18bd69d9f6a78a34cf7ff50ac2d249 100644 (file)
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -271,12 +271,9 @@ struct gdbarch_info
 typedef struct gdbarch *(gdbarch_init_ftype) (struct gdbarch_info info, struct gdbarch_list *arches);
 typedef void (gdbarch_dump_tdep_ftype) (struct gdbarch *gdbarch, struct ui_file *file);
 
-/* DEPRECATED - use gdbarch_register() */
-extern void register_gdbarch_init (enum bfd_architecture architecture, gdbarch_init_ftype *);
-
 extern void gdbarch_register (enum bfd_architecture architecture,
-                             gdbarch_init_ftype *,
-                             gdbarch_dump_tdep_ftype *);
+                             gdbarch_init_ftype *init,
+                             gdbarch_dump_tdep_ftype *dump_tdep = nullptr);
 
 
 /* Return a vector of the valid architecture names.  Since architectures are

diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index c4d9824ffda6e337eb08a3225637e954cf628dc0..d453fce3319e6c075a9983b235f6f02e1ca06c37 100644 (file)
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -1383,7 +1383,7 @@ void _initialize_h8300_tdep ();
 void
 _initialize_h8300_tdep ()
 {
-  register_gdbarch_init (bfd_arch_h8300, h8300_gdbarch_init);
+  gdbarch_register (bfd_arch_h8300, h8300_gdbarch_init);
 }
 
 static int

diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index d8e910bb407de8fad4b46d819dc93a0e0650bf9c..c652fb9c2a1c407cef2b068af168713fb8e02ada 100644 (file)
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -9071,7 +9071,7 @@ void _initialize_i386_tdep ();
 void
 _initialize_i386_tdep ()
 {
-  register_gdbarch_init (bfd_arch_i386, i386_gdbarch_init);
+  gdbarch_register (bfd_arch_i386, i386_gdbarch_init);
 
   /* Add the variable that controls the disassembly flavor.  */
   add_setshow_enum_cmd ("disassembly-flavor", no_class, valid_flavors,

diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
index 42fcc46ac85a36a835531e081fcb40ada9675293..e5fe1c6246678474d6a2dfd0119b402c642b1ae3 100644 (file)
--- a/gdb/iq2000-tdep.c
+++ b/gdb/iq2000-tdep.c
@@ -844,5 +844,5 @@ void _initialize_iq2000_tdep ();
 void
 _initialize_iq2000_tdep ()
 {
-  register_gdbarch_init (bfd_arch_iq2000, iq2000_gdbarch_init);
+  gdbarch_register (bfd_arch_iq2000, iq2000_gdbarch_init);
 }

diff --git a/gdb/lm32-tdep.c b/gdb/lm32-tdep.c
index 4cbff537fab883ccabf13decea647faba6b59bf1..af322511cfaf7e12d5ecfbd7471b3354dbbfa156 100644 (file)
--- a/gdb/lm32-tdep.c
+++ b/gdb/lm32-tdep.c
@@ -539,5 +539,5 @@ void _initialize_lm32_tdep ();
 void
 _initialize_lm32_tdep ()
 {
-  register_gdbarch_init (bfd_arch_lm32, lm32_gdbarch_init);
+  gdbarch_register (bfd_arch_lm32, lm32_gdbarch_init);
 }

diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c
index 30f716b6969a47e8b7ee375caf480ef8bbdecee5..83b7432f49111c74cd6d23a3f26b87685aab430c 100644 (file)
--- a/gdb/m32c-tdep.c
+++ b/gdb/m32c-tdep.c
@@ -2658,7 +2658,7 @@ void _initialize_m32c_tdep ();
 void
 _initialize_m32c_tdep ()
 {
-  register_gdbarch_init (bfd_arch_m32c, m32c_gdbarch_init);
+  gdbarch_register (bfd_arch_m32c, m32c_gdbarch_init);
 
   m32c_dma_reggroup = reggroup_new ("dma", USER_REGGROUP);
 }

diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index 3ad4c8de6bf2e15284eb7b9ce496f7f8725284c8..7edbd500bc5e98b13667d826830509540ac530fe 100644 (file)
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -916,5 +916,5 @@ void _initialize_m32r_tdep ();
 void
 _initialize_m32r_tdep ()
 {
-  register_gdbarch_init (bfd_arch_m32r, m32r_gdbarch_init);
+  gdbarch_register (bfd_arch_m32r, m32r_gdbarch_init);
 }

diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index 7ea1f9a5b9173f5db8a92b4fd8fb0e87f9dea53e..53b7752f073f73051f58f6b417cefd8fd549fff0 100644 (file)
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -1533,8 +1533,8 @@ void _initialize_m68hc11_tdep ();
 void
 _initialize_m68hc11_tdep ()
 {
-  register_gdbarch_init (bfd_arch_m68hc11, m68hc11_gdbarch_init);
-  register_gdbarch_init (bfd_arch_m68hc12, m68hc11_gdbarch_init);
+  gdbarch_register (bfd_arch_m68hc11, m68hc11_gdbarch_init);
+  gdbarch_register (bfd_arch_m68hc12, m68hc11_gdbarch_init);
   m68hc11_init_reggroups ();
 } 
 

diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index 170b4b0746086a4c3b8be4642ca00245dab6ea4a..66b7656b3d5a78d08792cb7d74f407520e857ac6 100644 (file)
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -2463,7 +2463,7 @@ _initialize_mep_tdep ()
   mep_cr_reggroup  = reggroup_new ("cr", USER_REGGROUP); 
   mep_ccr_reggroup = reggroup_new ("ccr", USER_REGGROUP);
 
-  register_gdbarch_init (bfd_arch_mep, mep_gdbarch_init);
+  gdbarch_register (bfd_arch_mep, mep_gdbarch_init);
 
   mep_init_pseudoregister_maps ();
 }

diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index 3d5dd66934131d7c8d49cec83928244a0e93d80a..3525453deeb0c5d25adf12ad4b668f63010243bf 100644 (file)
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -742,7 +742,7 @@ void _initialize_microblaze_tdep ();
 void
 _initialize_microblaze_tdep ()
 {
-  register_gdbarch_init (bfd_arch_microblaze, microblaze_gdbarch_init);
+  gdbarch_register (bfd_arch_microblaze, microblaze_gdbarch_init);
 
   initialize_tdesc_microblaze_with_stack_protect ();
   initialize_tdesc_microblaze ();

diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index f5cf501cea06ce33d470452da04b5515531c121b..77e1c33ecb6804846fb8f6b612990c841f84960f 100644 (file)
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -1108,5 +1108,5 @@ void _initialize_moxie_tdep ();
 void
 _initialize_moxie_tdep ()
 {
-  register_gdbarch_init (bfd_arch_moxie, moxie_gdbarch_init);
+  gdbarch_register (bfd_arch_moxie, moxie_gdbarch_init);
 }

diff --git a/gdb/msp430-tdep.c b/gdb/msp430-tdep.c
index cf4106d1a345c58cb7118eeb6ce24579d02b6764..35bea093076efcfaf28321fd330bcd2880f8c70a 100644 (file)
--- a/gdb/msp430-tdep.c
+++ b/gdb/msp430-tdep.c
@@ -996,5 +996,5 @@ void _initialize_msp430_tdep ();
 void
 _initialize_msp430_tdep ()
 {
-  register_gdbarch_init (bfd_arch_msp430, msp430_gdbarch_init);
+  gdbarch_register (bfd_arch_msp430, msp430_gdbarch_init);
 }

diff --git a/gdb/nds32-tdep.c b/gdb/nds32-tdep.c
index 11bfd2d1f54e48ed282b4493c028503fffb77952..5b555236d46302c59a7232ccdbf4c67d6bf4a6a4 100644 (file)
--- a/gdb/nds32-tdep.c
+++ b/gdb/nds32-tdep.c
@@ -2093,7 +2093,7 @@ void
 _initialize_nds32_tdep ()
 {
   /* Initialize gdbarch.  */
-  register_gdbarch_init (bfd_arch_nds32, nds32_gdbarch_init);
+  gdbarch_register (bfd_arch_nds32, nds32_gdbarch_init);
 
   initialize_tdesc_nds32 ();
   nds32_init_reggroups ();

diff --git a/gdb/rl78-tdep.c b/gdb/rl78-tdep.c
index be668bfa6fe6350c4ab225c860ff290031044bd0..3920fa1226524ae4a5d69668031bc28c02d240b1 100644 (file)
--- a/gdb/rl78-tdep.c
+++ b/gdb/rl78-tdep.c
@@ -1489,5 +1489,5 @@ void _initialize_rl78_tdep ();
 void
 _initialize_rl78_tdep ()
 {
-  register_gdbarch_init (bfd_arch_rl78, rl78_gdbarch_init);
+  gdbarch_register (bfd_arch_rl78, rl78_gdbarch_init);
 }

diff --git a/gdb/rx-tdep.c b/gdb/rx-tdep.c
index 989d90096bdbcd57fcf58af14af107e7f46209c0..c7e7c3fde2fcbd9037421908e8174f6928ba836a 100644 (file)
--- a/gdb/rx-tdep.c
+++ b/gdb/rx-tdep.c
@@ -1063,6 +1063,6 @@ void _initialize_rx_tdep ();
 void
 _initialize_rx_tdep ()
 {
-  register_gdbarch_init (bfd_arch_rx, rx_gdbarch_init);
+  gdbarch_register (bfd_arch_rx, rx_gdbarch_init);
   initialize_tdesc_rx ();
 }

diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index 2aeb3a14637c3e74786b5c1d6ba34ab74a7fca1e..7f0ed65c8d21e8b47155c8350b181efa24c8f43a 100644 (file)
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -7229,7 +7229,7 @@ void
 _initialize_s390_tdep ()
 {
   /* Hook us into the gdbarch mechanism.  */
-  register_gdbarch_init (bfd_arch_s390, s390_gdbarch_init);
+  gdbarch_register (bfd_arch_s390, s390_gdbarch_init);
 
   initialize_tdesc_s390_linux32 ();
   initialize_tdesc_s390x_linux64 ();

diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index 397f5489550953fea6a011f1ac1a9ea9c0321b07..0f5da2c393a3d968c8b7f95f35ace887950dd6e7 100644 (file)
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -2269,5 +2269,5 @@ void _initialize_sparc_tdep ();
 void
 _initialize_sparc_tdep ()
 {
-  register_gdbarch_init (bfd_arch_sparc, sparc32_gdbarch_init);
+  gdbarch_register (bfd_arch_sparc, sparc32_gdbarch_init);
 }

diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
index b7efcf18576555371f42e8edd194ff2c35659307..775768347335d9ae5dd3fd88f1960fd62d920b0d 100644 (file)
--- a/gdb/tic6x-tdep.c
+++ b/gdb/tic6x-tdep.c
@@ -1302,5 +1302,5 @@ void _initialize_tic6x_tdep ();
 void
 _initialize_tic6x_tdep ()
 {
-  register_gdbarch_init (bfd_arch_tic6x, tic6x_gdbarch_init);
+  gdbarch_register (bfd_arch_tic6x, tic6x_gdbarch_init);
 }

diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index 9668aa80b53cc17448924264de574e5b8811b336..744aca96438039856bc414847056bd449313ae6d 100644 (file)
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -1028,5 +1028,5 @@ void _initialize_tilegx_tdep ();
 void
 _initialize_tilegx_tdep ()
 {
-  register_gdbarch_init (bfd_arch_tilegx, tilegx_gdbarch_init);
+  gdbarch_register (bfd_arch_tilegx, tilegx_gdbarch_init);
 }

diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
index f7094e37a9266a03e86a47af8c5dd949045cf932..232b92d0a08f3d56a586d364bb9db01a1b4a54e3 100644 (file)
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -1465,6 +1465,6 @@ void _initialize_v850_tdep ();
 void
 _initialize_v850_tdep ()
 {
-  register_gdbarch_init (bfd_arch_v850, v850_gdbarch_init);
-  register_gdbarch_init (bfd_arch_v850_rh850, v850_gdbarch_init);
+  gdbarch_register (bfd_arch_v850, v850_gdbarch_init);
+  gdbarch_register (bfd_arch_v850_rh850, v850_gdbarch_init);
 }

diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index c0fe5dab1cbf77937dc10ca0e8eef0c0483a022c..10c0d3e6b1c39209e7efc040b4713e2c6c9b59ee 100644 (file)
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -838,5 +838,5 @@ void _initialize_xstormy16_tdep ();
 void
 _initialize_xstormy16_tdep ()
 {
-  register_gdbarch_init (bfd_arch_xstormy16, xstormy16_gdbarch_init);
+  gdbarch_register (bfd_arch_xstormy16, xstormy16_gdbarch_init);
 }

diff --git a/gdb/z80-tdep.c b/gdb/z80-tdep.c
index 1ab375c5014ea848f6f902b3db14bbb7489d54c8..684f08303c439ae4fe3d40433c0b3eaa492e64ca 100644 (file)
--- a/gdb/z80-tdep.c
+++ b/gdb/z80-tdep.c
@@ -1460,6 +1460,6 @@ extern initialize_file_ftype _initialize_z80_tdep;
 void
 _initialize_z80_tdep ()
 {
-  register_gdbarch_init (bfd_arch_z80, z80_gdbarch_init);
+  gdbarch_register (bfd_arch_z80, z80_gdbarch_init);
   initialize_tdesc_z80 ();
 }