This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH/committed] sim: mips: fix dv-tx3904cpu build error
- From: Mike Frysinger <vapier at gentoo dot org>
- To: gdb-patches at sourceware dot org
- Date: Fri, 11 Nov 2016 01:37:47 -0500
- Subject: [PATCH/committed] sim: mips: fix dv-tx3904cpu build error
- Authentication-results: sourceware.org; auth=none
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 <joel.sherrill@oarcorp.com>
---
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 <vapier@gentoo.org>
+ * dv-tx3904cpu.c (deliver_tx3904cpu_interrupt): Define CPU to cpu
+ and SD to sd.
+
+2016-11-11 Mike Frysinger <vapier@gentoo.org>
+
* mips.igen (check_u64): Enable for `r3900'.
2016-02-05 Mike Frysinger <vapier@gentoo.org>
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
}
--
2.9.0