[binutils-gdb] sim: dv-sockser: localize init callback

[Michael Frysinger]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=328e805b5a7d4f27552a1062e25a89477bd89009

commit 328e805b5a7d4f27552a1062e25a89477bd89009
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Sat Jan 2 10:53:03 2016 -0500

    sim: dv-sockser: localize init callback
    
    Now that we don't need to hardcode the module init list in a single
    place, move the dv-sockser logic to the place to the one file.

Diff:
---
 sim/common/ChangeLog    | 8 ++++++++
 sim/common/dv-sockser.c | 5 ++++-
 sim/common/dv-sockser.h | 2 --
 sim/common/sim-module.c | 9 ---------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index d00696354dd..55d684bfeab 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,11 @@
+2021-05-01  Mike Frysinger  <vapier@gentoo.org>
+
+	* dv-sockser.c (dv_sockser_install): Rename to ...
+	(sim_install_dv_sockser): ... this.
+	* dv-sockser.h (dv_sockser_install): Delete.
+	* sim-module.c: Delete dv-sockser.h include.
+	(early_modules): Delete dv_sockser_install.
+
 2021-05-01  Mike Frysinger  <vapier@gentoo.org>
 
 	* Make-common.in (LIB_OBJS): Add modules.o.
diff --git a/sim/common/dv-sockser.c b/sim/common/dv-sockser.c
index fc552fa0acf..73c473b15c0 100644
--- a/sim/common/dv-sockser.c
+++ b/sim/common/dv-sockser.c
@@ -222,8 +222,11 @@ dv_sockser_uninstall (SIM_DESC sd)
     }
 }
 
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+extern MODULE_INIT_FN sim_install_dv_sockser;
+
 SIM_RC
-dv_sockser_install (SIM_DESC sd)
+sim_install_dv_sockser (SIM_DESC sd)
 {
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
   if (sim_add_option_table (sd, NULL, sockser_options) != SIM_RC_OK)
diff --git a/sim/common/dv-sockser.h b/sim/common/dv-sockser.h
index c83ed5a9aa6..36ec0a970b1 100644
--- a/sim/common/dv-sockser.h
+++ b/sim/common/dv-sockser.h
@@ -34,8 +34,6 @@ int dv_sockser_write (SIM_DESC, unsigned char);
 int dv_sockser_write_buffer (SIM_DESC, const unsigned char *, unsigned);
 int dv_sockser_read (SIM_DESC);
 
-SIM_RC dv_sockser_install (SIM_DESC);
-
 #else
 
 /* If dv-sockser isn't available, provide stub functions.  */
diff --git a/sim/common/sim-module.c b/sim/common/sim-module.c
index a776a082176..2557697fff2 100644
--- a/sim/common/sim-module.c
+++ b/sim/common/sim-module.c
@@ -29,11 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim-hw.h"
 #endif
 
-#ifdef HAVE_DV_SOCKSER
-/* TODO: Shouldn't have device models here.  */
-#include "dv-sockser.h"
-#endif
-
 #include "libiberty.h"
 
 #include <stdlib.h>
@@ -60,10 +55,6 @@ static MODULE_INSTALL_FN * const early_modules[] = {
 #if WITH_HW
   sim_hw_install,
 #endif
-#ifdef HAVE_DV_SOCKSER
-  /* TODO: Shouldn't have device models here.  */
-  dv_sockser_install,
-#endif
 };
 static int early_modules_len = ARRAY_SIZE (early_modules);