sim: mips: fix dv-tx3904cpu build error

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>

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index dae00e7d34dd6a038e36848579577b0777cc0540..2b1a032b080d1c11c0f26ce6c504acfe3dd4cea5 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,8 @@
+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'.

diff --git a/sim/mips/dv-tx3904cpu.c b/sim/mips/dv-tx3904cpu.c
index da28a49a60cabf7b984ab406fdd9ca82b8b94d98..4a0ec441dcd4799a66359676957ba542138d821f 100644 (file)
--- 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
 }