sim: drop WITH_ENGINE define

We enable this everywhere already, and all new ports should use the
engine logic, so no point in making it an option to disable.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 09f29bb9e28efd79bcce94cec20c208e22cf722b..e6ac042f1f450f624274965d4a7cf89d8e78382b 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-25  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-config.h (WITH_ENGINE): Delete.
+       * sim-module.c (modules): Always include sim_engine_install.
+
 2015-12-25  Mike Frysinger  <vapier@gentoo.org>
 
        * Make-common.in (SIM_NEW_COMMON_OBJS): Add sim-model.o.

diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h
index 064d9368947cf61ecea5dc2e22e1fc3bd9030ff4..cbe656ac916c1350825ae9f05a2970062a78fff1 100644 (file)
--- a/sim/common/sim-config.h
+++ b/sim/common/sim-config.h
@@ -454,19 +454,6 @@ extern int current_floating_point;
 #endif
 
 
-
-/* Engine module.
-
-   Use the common start/stop/restart framework (sim-engine).
-   Simulators using the other modules but not the engine should define
-   WITH_ENGINE=0. */
-
-#ifndef WITH_ENGINE
-#define WITH_ENGINE                    1
-#endif
-
-
-
 /* Debugging:
 
    Control the inclusion of debugging code.

diff --git a/sim/common/sim-module.c b/sim/common/sim-module.c
index 670225bd7731d07ce9d4ffe0d60e021e8b0d195f..3d49f57865398e4fc76a1f7f42fb09c9cde305b4 100644 (file)
--- a/sim/common/sim-module.c
+++ b/sim/common/sim-module.c
@@ -41,9 +41,7 @@ static MODULE_INSTALL_FN * const modules[] = {
   standard_install,
   sim_events_install,
   sim_model_install,
-#if WITH_ENGINE
   sim_engine_install,
-#endif
 #if WITH_TRACE_ANY_P
   trace_install,
 #endif