From patchwork Wed Aug 20 04:38:16 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: 2449 Received: (qmail 10434 invoked by alias); 20 Aug 2014 04:38:27 -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 10420 invoked by uid 89); 20 Aug 2014 04:38:23 -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: bastet.se.axis.com Received: from bastet.se.axis.com (HELO bastet.se.axis.com) (195.60.68.11) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 20 Aug 2014 04:38:22 +0000 Received: from localhost (localhost [127.0.0.1]) by bastet.se.axis.com (Postfix) with ESMTP id BAF75180BC for ; Wed, 20 Aug 2014 06:38:20 +0200 (CEST) Received: from bastet.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bastet.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id MbtNpVp2Kvrx for ; Wed, 20 Aug 2014 06:38:17 +0200 (CEST) Received: from boulder.se.axis.com (boulder.se.axis.com [10.0.2.104]) by bastet.se.axis.com (Postfix) with ESMTP id F04DE180B5 for ; Wed, 20 Aug 2014 06:38:16 +0200 (CEST) Received: from boulder.se.axis.com (localhost [127.0.0.1]) by postfix.imss71 (Postfix) with ESMTP id D8DD4EEF for ; Wed, 20 Aug 2014 06:38:16 +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 CDBD7E81 for ; Wed, 20 Aug 2014 06:38:16 +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 CB53B3E048; Wed, 20 Aug 2014 06:38:16 +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 s7K4cGQD032102; Wed, 20 Aug 2014 06:38:16 +0200 Received: (from hp@localhost) by ignucius.se.axis.com (8.12.8p1/8.12.8/Debian-2woody1) id s7K4cG4q032098; Wed, 20 Aug 2014 06:38:16 +0200 Date: Wed, 20 Aug 2014 06:38:16 +0200 Message-Id: <201408200438.s7K4cG4q032098@ignucius.se.axis.com> From: Hans-Peter Nilsson To: gdb-patches@sourceware.org Subject: [RFC 4/4] Fix m32r-elf sim, default hardware to off. MIME-Version: 1.0 Situation similar to others; fails at the dv_sockser_install declaration in sim/m32r/tconfig.in. But, as opposed to e.g. frv, this one has a definition of UART_INCHAR_ADDR et al. It's somewhat tempting to keep sim-hardware enabled here but, I'm disabling it for the same reasons as for frv. Unsurprisingly (as m32r seems the original and frv the copy-paste) the same confusing lines are in sim/m32r/Makefile.in as in sim/frv/Makefile.in at that time, deleted in 73e76d20. Again, commit 73e76d20 (for m32r as well as for frv) attempted to move the non-existing dv-sockser.o use to $(m32r_extra_objs) but missed that AC_SUBST would only affect @m32r_extra_objs@ and not $(m32r_extra_objs) per se so nothing happened. As for frv, I'm removing the $(m32r_extra_objs) too to avoid confusion. Make check-sim for m32r-elf shows no regressions (5 failures; 100 expected passes) compared to bf3d9781ec049 (before the recent config.in regen, after sim-hardware mostly-enabled) and eed23bb4a1 (before the sim-hardware mostly-enabled; 2013-03-23). sim/m32r: * configure.ac: Default simulator hardware to off again. Remove dead m32r_extra_objs substitution. * configure: Regenerate. * Makefile.in: Remove unused frv_extra_objs. brgds, H-P diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in index 585eadf..2841a1b 100644 --- a/sim/m32r/Makefile.in +++ b/sim/m32r/Makefile.in @@ -38,8 +38,7 @@ SIM_OBJS = \ $(M32RX_OBJS) \ $(M32R2_OBJS) \ $(TRAPS_OBJ) \ - devices.o \ - $(m32r_extra_objs) + devices.o # Extra headers included by sim-main.h. SIM_EXTRA_DEPS = \ diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac index 76fed95..d5c728e 100644 --- a/sim/m32r/configure.ac +++ b/sim/m32r/configure.ac @@ -27,8 +27,6 @@ SIM_AC_OPTION_CGEN_MAINT AC_SUBST(traps_obj) AC_SUBST(sim_extra_cflags) -SIM_AC_OPTION_HARDWARE(yes,"","") -m32r_extra_objs="$SIM_DV_SOCKSER_O" -AC_SUBST(m32r_extra_objs) +SIM_AC_OPTION_HARDWARE(no,"","") SIM_AC_OUTPUT