From 953fac6481598d64087f45030f243374ba599099 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 13 Jun 2021 22:43:54 -0400
Subject: [PATCH] sim: move profile init to dynamic modules.c

Use the new modules.c framework to find & initialize this module.
---
 sim/common/ChangeLog     | 7 +++++++
 sim/common/sim-module.c  | 3 ---
 sim/common/sim-profile.c | 6 ++++--
 sim/common/sim-profile.h | 3 ---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index ee6d97daf7..c3c7d3e7b5 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,10 @@
+2021-06-30  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-module.c (early_modules): Delete profile_install.
+	* sim-profile.c (profile_install): Rename to ...
+	(sim_install_profile): ... this.  New prototype.
+	* sim-profile.h (profile_install): Delete.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-module.c (early_modules): Delete trace_install.
diff --git a/sim/common/sim-module.c b/sim/common/sim-module.c
index d9d0804382..120785e769 100644
--- a/sim/common/sim-module.c
+++ b/sim/common/sim-module.c
@@ -37,9 +37,6 @@ static MODULE_INSTALL_FN * const early_modules[] = {
   standard_install,
   sim_events_install,
   sim_model_install,
-#if WITH_PROFILE
-  profile_install,
-#endif
   sim_core_install,
   sim_memopt_install,
   sim_watchpoint_install,
diff --git a/sim/common/sim-profile.c b/sim/common/sim-profile.c
index f2d65e0930..3a8ed1f256 100644
--- a/sim/common/sim-profile.c
+++ b/sim/common/sim-profile.c
@@ -1216,10 +1216,12 @@ profile_info (SIM_DESC sd, int verbose)
 
 }
 
-/* Install profiling support in the simulator.  */
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+SIM_RC sim_install_profile (SIM_DESC sd);
 
+/* Install profiling support in the simulator.  */
 SIM_RC
-profile_install (SIM_DESC sd)
+sim_install_profile (SIM_DESC sd)
 {
   int i;
 
diff --git a/sim/common/sim-profile.h b/sim/common/sim-profile.h
index 17017c469a..06cdd35555 100644
--- a/sim/common/sim-profile.h
+++ b/sim/common/sim-profile.h
@@ -102,9 +102,6 @@ SIM_RC sim_profile_set_option (SIM_DESC sd_, const char *name_, int idx_,
 #define WITH_PROFILE_MEMORY_P 0
 #endif
 
-/* Profiling install handler.  */
-MODULE_INSTALL_FN profile_install;
-
 /* Output format macros.  */
 #ifndef PROFILE_HISTOGRAM_WIDTH
 #define PROFILE_HISTOGRAM_WIDTH 40
-- 
2.34.1