From patchwork Fri Dec 25 09:50:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 10127 X-Patchwork-Delegate: vapier@gentoo.org Received: (qmail 67275 invoked by alias); 25 Dec 2015 09:50:08 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 67259 invoked by uid 89); 25 Dec 2015 09:50:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=417, 419, Engine X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 25 Dec 2015 09:50:06 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 69AA333BE44 for ; Fri, 25 Dec 2015 09:50:04 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: drop WITH_ENGINE define [committed] Date: Fri, 25 Dec 2015 04:50:03 -0500 Message-Id: <1451037003-14062-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes 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