From caaf412e9890dac4323b47b58cd38b7ebb26a7db Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Thu, 1 Apr 2021 07:17:14 +0200 Subject: [PATCH] Fix microblaze sim build error I see the following error for --target=microblaze-elf: ../../../sim/microblaze/interp.c: In function 'sim_engine_run': ../../../sim/microblaze/interp.c:147:39: error: passing argument 2 of 'get_insn_microblaze' from incompatible pointer type [-Werror=incompatible-pointer-types] 147 | op = get_insn_microblaze (inst, &imm_unsigned, &insn_type, | ^~~~~~~~~~~~~ | | | int * In file included from ../../bfd/bfd.h:45, from ../../../sim/microblaze/interp.c:24: ../../../sim/microblaze/../../opcodes/microblaze-dis.h:34:57: note: expected '_Bool *' but argument is of type 'int *' 34 | extern enum microblaze_instr get_insn_microblaze (long, bool *, | ^ sim/microblaze/ChangeLog: * interp.c (sim_engine_run): Use bool instead of int. --- sim/microblaze/ChangeLog | 4 ++++ sim/microblaze/interp.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index c20e7c4a148..ac1d479e4f9 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,3 +1,7 @@ +2021-04-01 Martin Liska + + * interp.c (sim_engine_run): Use bool instead of int. + 2021-02-28 Mike Frysinger * configure: Regenerate. diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c index 5b125a64da2..8a9dbc3245a 100644 --- a/sim/microblaze/interp.c +++ b/sim/microblaze/interp.c @@ -126,7 +126,7 @@ sim_engine_run (SIM_DESC sd, int cycs; word WLhash; ubyte carry; - int imm_unsigned; + bool imm_unsigned; short ra, rb, rd; long immword; uword oldpc, newpc; -- 2.30.2