From patchwork Wed Aug 20 04:29:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans-Peter Nilsson X-Patchwork-Id: 2446 Received: (qmail 12469 invoked by alias); 20 Aug 2014 04:29:48 -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 12460 invoked by uid 89); 20 Aug 2014 04:29:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.5 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLACK, WEIRD_QUOTING autolearn=no version=3.3.2 X-HELO: bes.se.axis.com Received: from bes.se.axis.com (HELO bes.se.axis.com) (195.60.68.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 20 Aug 2014 04:29:46 +0000 Received: from localhost (localhost [127.0.0.1]) by bes.se.axis.com (Postfix) with ESMTP id F30002E2D0 for ; Wed, 20 Aug 2014 06:29:43 +0200 (CEST) Received: from bes.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bes.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id 69MwcBlgomyd for ; Wed, 20 Aug 2014 06:29:40 +0200 (CEST) Received: from boulder.se.axis.com (boulder.se.axis.com [10.0.2.104]) by bes.se.axis.com (Postfix) with ESMTP id 39B9A2E538 for ; Wed, 20 Aug 2014 06:29:40 +0200 (CEST) Received: from boulder.se.axis.com (localhost [127.0.0.1]) by postfix.imss71 (Postfix) with ESMTP id 1CE8CEF3 for ; Wed, 20 Aug 2014 06:29:40 +0200 (CEST) Received: from seth.se.axis.com (seth.se.axis.com [10.0.2.172]) by boulder.se.axis.com (Postfix) with ESMTP id 11D57EDD for ; Wed, 20 Aug 2014 06:29:40 +0200 (CEST) Received: from ignucius.se.axis.com (ignucius.se.axis.com [10.88.21.50]) by seth.se.axis.com (Postfix) with ESMTP id 0F5CF3E048; Wed, 20 Aug 2014 06:29:40 +0200 (CEST) Received: from ignucius.se.axis.com (localhost [127.0.0.1]) by ignucius.se.axis.com (8.12.8p1/8.12.8/Debian-2woody1) with ESMTP id s7K4TdQD031711; Wed, 20 Aug 2014 06:29:39 +0200 Received: (from hp@localhost) by ignucius.se.axis.com (8.12.8p1/8.12.8/Debian-2woody1) id s7K4Tduf031707; Wed, 20 Aug 2014 06:29:39 +0200 Date: Wed, 20 Aug 2014 06:29:39 +0200 Message-Id: <201408200429.s7K4Tduf031707@ignucius.se.axis.com> From: Hans-Peter Nilsson To: gdb-patches@sourceware.org Subject: [RFC 1/4] Fix frv-elf sim, default hardware to off. MIME-Version: 1.0 At 2974be626, frv-elf (as do all these simulators) fails at the dv_sockser_install declaration in sim/frv/tconfig.in. But, with the trivial #include's added (see other sims tconfig.in, like cris or mn10300), it *still* fails building sim/frv/devices.c because of a missing UART_INCHAR_ADDR. I have no insight into what'd be a valid value, but see m32r below. Looking closer, "hardware support" for this simulator was apparently never completed. It should not have been be enabled, and was indeed not enabled by default before 94c63d78f (2013-03-23), where it seems to have been enabled for no simulator-specific reason. Except dv-sockser.o wasn't enabled even then: as sim/frv/config.in wasn't regenerated, HAVE_DV_SOCKSER was never defined. Maybe people were fooled by this in sim/frv/Makefile.in at that time (these two lines were later deleted, in 73e76d20): CONFIG_DEVICES = dv-sockser.o CONFIG_DEVICES = As it seems people have missed it before: the second line overrides the first... I'm guessing these lines were part of the never-completed hardware-support. Commit 73e76d20 attempted to move the imagined dv-sockser.o from $(CONFIG_DEVICES) to $(frv_extra_objs) but missed that AC_SUBST would only affect @frv_extra_objs@ (not $(frv_extra_objs) per se) so nothing happened regarding sockser: dv-sockser.o was not compiled and HAVE_DV_SOCKSER was not defined. I'm removing the $(frv_extra_objs) too, to avoid confusion. The best action seems to be disabling all hardware support by default again until someone, like a specific sim maintainer, finishes the work. Make check-sim for frv-elf shows no failures after this. sim/frv: * configure.ac: Default simulator hardware to off again. Remove dead frv_extra_objs substitution. * configure: Regenerate. * Makefile.in: Remove unused frv_extra_objs. brgds, H-P diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in index 295498e..ed7a592 100644 --- a/sim/frv/Makefile.in +++ b/sim/frv/Makefile.in @@ -32,8 +32,7 @@ SIM_OBJS = \ $(FRV_OBJS) \ traps.o interrupts.o memory.o cache.o pipeline.o \ profile.o profile-fr400.o profile-fr450.o profile-fr500.o profile-fr550.o options.o \ - devices.o reset.o registers.o \ - $(frv_extra_objs) + devices.o reset.o registers.o # Extra headers included by sim-main.h. SIM_EXTRA_DEPS = \ diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac index df888d9..05faf03 100644 --- a/sim/frv/configure.ac +++ b/sim/frv/configure.ac @@ -28,8 +28,6 @@ if test x"$silent" != x"yes" && test x"$sim_trapdump" != x""; then fi],[sim_trapdump=""])dnl AC_SUBST(sim_trapdump) -SIM_AC_OPTION_HARDWARE(always,"","") -frv_extra_objs="$SIM_DV_SOCKSER_O" -AC_SUBST(frv_extra_objs) +SIM_AC_OPTION_HARDWARE(no,"","") SIM_AC_OUTPUT