From cf59f47ebeccf4ea82b6c529c882644e4c445323 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 25 Dec 2015 04:45:57 -0500 Subject: [PATCH] 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. --- sim/common/ChangeLog | 5 +++++ sim/common/sim-config.h | 13 ------------- sim/common/sim-module.c | 2 -- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 09f29bb..e6ac042 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,5 +1,10 @@ 2015-12-25 Mike Frysinger + * sim-config.h (WITH_ENGINE): Delete. + * sim-module.c (modules): Always include sim_engine_install. + +2015-12-25 Mike Frysinger + * Make-common.in (SIM_NEW_COMMON_OBJS): Add sim-model.o. * cgen-types.h (SIM_HAVE_MODEL): Delete. * sim-base.h: Always include sim-model.h. diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h index 064d936..cbe656a 100644 --- 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 670225b..3d49f57 100644 --- 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 -- 2.7.4