From 2871d4d7f3c2971b6dbf003cf8942562cb6526bd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 1 Nov 2021 00:56:52 -0400 Subject: [PATCH] sim: lm32: reduce -Wno-error scope Clean up some warnings in dv-lm32cpu, and all in sim-if, then reduce the -Werror disable to the files that still aren't clean that now that we require GNU make and can set variables on a per-object basis. --- sim/lm32/Makefile.in | 4 ++-- sim/lm32/dv-lm32cpu.c | 2 +- sim/lm32/sim-if.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in index 2daf74d637b..642c483acd2 100644 --- a/sim/lm32/Makefile.in +++ b/sim/lm32/Makefile.in @@ -24,8 +24,8 @@ SIM_EXTRA_DEPS = $(CGEN_INCLUDE_DEPS) $(srcdir)/../../opcodes/lm32-desc.h \ SIM_EXTRA_CLEAN = lm32-clean -# Code doesn't build cleanly yet. -SIM_WERROR_CFLAGS = +# Some modules don't build cleanly yet. +dv-lm32cpu.o mloop.o sem.o traps.o user.o: SIM_WERROR_CFLAGS = ## COMMON_POST_CONFIG_FRAG diff --git a/sim/lm32/dv-lm32cpu.c b/sim/lm32/dv-lm32cpu.c index 2f702bd7229..83fe6078b0b 100644 --- a/sim/lm32/dv-lm32cpu.c +++ b/sim/lm32/dv-lm32cpu.c @@ -141,7 +141,7 @@ deliver_lm32cpu_interrupt (struct hw *me, void *data) SIM_DESC sd = hw_system (me); sim_cpu *cpu = STATE_CPU (sd, 0); /* NB: fix CPU 0. */ address_word cia = CPU_PC_GET (cpu); - int interrupt = (int) data; + int interrupt = (uintptr_t) data; HW_TRACE ((me, "interrupt-check event")); diff --git a/sim/lm32/sim-if.c b/sim/lm32/sim-if.c index f9143ea0037..2f8b3449917 100644 --- a/sim/lm32/sim-if.c +++ b/sim/lm32/sim-if.c @@ -158,8 +158,8 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, free_state (sd); return 0; } - /*sim_io_printf (sd, "Allocating memory at 0x%x size 0x%x\n", base, limit); */ - sim_do_commandf (sd, "memory region 0x%x,0x%x", base, limit); + /*sim_io_printf (sd, "Allocating memory at 0x%lx size 0x%lx\n", base, limit); */ + sim_do_commandf (sd, "memory region 0x%lx,0x%lx", base, limit); } } -- 2.30.2