OSDN Git Service

hw/sparc: Allow building without the leon3 machine
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>
Wed, 28 Apr 2021 14:16:51 +0000 (16:16 +0200)
committerMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Tue, 4 May 2021 21:45:53 +0000 (22:45 +0100)
commit12841199918cc78890de99b4d0edddfd8e1fa484
tree130a21e2baa1e7bb4c19e4595e1f4ed564b70455
parentbcdd781ff8c695920fe5534a34c6ab77889601c1
hw/sparc: Allow building without the leon3 machine

When building without the leon3 machine, we get this link failure:

  /usr/bin/ld: target_sparc_int32_helper.c.o: in function `leon3_irq_manager':
  target/sparc/int32_helper.c:172: undefined reference to `leon3_irq_ack'

This is because the leon3_irq_ack() is declared in hw/sparc/leon3.c,
which is only build when CONFIG_LEON3 is selected.

Fix by moving the leon3_cache_control_int() / leon3_irq_manager()
(which are specific to the leon3 machine) to hw/sparc/leon3.c.
Move the trace events along (but don't rename them).

leon3_irq_ack() is now locally used, declare it static to reduce
its scope.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Tested-by: KONRAD Frederic <frederic.konrad@adacore.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20210428141655.387430-2-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
hw/sparc/leon3.c
hw/sparc/trace-events
target/sparc/cpu.h
target/sparc/int32_helper.c
target/sparc/trace-events