From patchwork Fri Nov 11 06:37:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 17408 Received: (qmail 96698 invoked by alias); 11 Nov 2016 06:38:02 -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 96565 invoked by uid 89); 11 Nov 2016 06:38:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 spammy=D*oarcorp.com, 20161111, controller, 2016-11-11 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 ESMTP; Fri, 11 Nov 2016 06:37:50 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 16F69341669 for ; Fri, 11 Nov 2016 06:37:48 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH/committed] sim: mips: fix dv-tx3904cpu build error Date: Fri, 11 Nov 2016 01:37:47 -0500 Message-Id: <20161111063747.31512-1-vapier@gentoo.org> X-IsSubscribed: yes When building for mipstx39-rtems4.12 targets, some funcs use SD and CPU implicitly. Restore the defines for these to the local sd and cpu vars. This was broken by the clean up in commit d47f5b30d8481272e9480118bdcb. Reported-by: Joel Sherrill --- sim/mips/ChangeLog | 5 +++++ sim/mips/dv-tx3904cpu.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog index dae00e7d34dd..2b1a032b080d 100644 --- a/sim/mips/ChangeLog +++ b/sim/mips/ChangeLog @@ -1,5 +1,10 @@ 2016-11-11 Mike Frysinger + * dv-tx3904cpu.c (deliver_tx3904cpu_interrupt): Define CPU to cpu + and SD to sd. + +2016-11-11 Mike Frysinger + * mips.igen (check_u64): Enable for `r3900'. 2016-02-05 Mike Frysinger diff --git a/sim/mips/dv-tx3904cpu.c b/sim/mips/dv-tx3904cpu.c index da28a49a60ca..4a0ec441dcd4 100644 --- a/sim/mips/dv-tx3904cpu.c +++ b/sim/mips/dv-tx3904cpu.c @@ -143,6 +143,9 @@ deliver_tx3904cpu_interrupt (struct hw *me, sim_cpu *cpu = STATE_CPU (sd, 0); /* NB: fix CPU 0. */ address_word cia = CPU_PC_GET (cpu); +#define CPU cpu +#define SD sd + if (controller->pending_reset) { controller->pending_reset = 0; @@ -187,6 +190,8 @@ deliver_tx3904cpu_interrupt (struct hw *me, } } /* interrupt set */ } +#undef CPU +#undef SD }