sim: mips: reduce -Wno-error scope

Fix a few printf warnings in sim-main.c, and then we're left with only
one file in here still generating warnings, so reduce the -Werror
disable to that alone now that we require GNU make and can set variables
on a per-object basis.

diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in
index 632cc20f3a8b812ec8ff6b8d56c9c3341fc430ac..b34fdf5b461e54043610e2c3b7ef78ca71a47eb0 100644 (file)
--- a/sim/mips/Makefile.in
+++ b/sim/mips/Makefile.in
@@ -77,8 +77,8 @@ all: $(SIM_@sim_gen@_ALL)
 
 SIM_EXTRA_DEPS = itable.h
 
-# Code doesn't build cleanly yet.
-SIM_WERROR_CFLAGS =
+# Some modules don't build cleanly yet.
+cp1.o: SIM_WERROR_CFLAGS =
 
 ## COMMON_POST_CONFIG_FRAG
 

diff --git a/sim/mips/sim-main.c b/sim/mips/sim-main.c
index 24e16029d22e6ab8a143e32f81013603d1ba2134..1b9be9567aa0ff59ac5d5dee5681796596729038 100644 (file)
--- a/sim/mips/sim-main.c
+++ b/sim/mips/sim-main.c
@@ -422,11 +422,11 @@ pending_tick (SIM_DESC SD,
              if (PENDING_SLOT_DELAY[index] == 0)                       
                {                                                       
                  if (PENDING_TRACE)
-                   sim_io_eprintf (SD, "PENDING_DRAIN - drained - index %d, dest 0x%lx, bit %d, val 0x%lx, size %d\n",
+                   sim_io_eprintf (SD, "PENDING_DRAIN - drained - index %d, dest %p, bit %d, val %" PRIx64 ", size %d\n",
                                    index,
-                                   (unsigned long) PENDING_SLOT_DEST[index],
+                                   PENDING_SLOT_DEST[index],
                                    PENDING_SLOT_BIT[index],
-                                   (unsigned long) PENDING_SLOT_VALUE[index],
+                                   PENDING_SLOT_VALUE[index],
                                    PENDING_SLOT_SIZE[index]);
                  if (PENDING_SLOT_BIT[index] >= 0)                     
                    switch (PENDING_SLOT_SIZE[index])                 
@@ -468,11 +468,11 @@ pending_tick (SIM_DESC SD,
                    }
                }                                                       
              else if (PENDING_TRACE && PENDING_SLOT_DELAY[index] > 0)
-               sim_io_eprintf (SD, "PENDING_DRAIN - queued - index %d, delay %d, dest 0x%lx, bit %d, val 0x%lx, size %d\n",
+               sim_io_eprintf (SD, "PENDING_DRAIN - queued - index %d, delay %d, dest %p, bit %d, val %" PRIx64 ", size %d\n",
                                index, PENDING_SLOT_DELAY[index],
-                               (unsigned long) PENDING_SLOT_DEST[index],
+                               PENDING_SLOT_DEST[index],
                                PENDING_SLOT_BIT[index],
-                               (unsigned long) PENDING_SLOT_VALUE[index],
+                               PENDING_SLOT_VALUE[index],
                                PENDING_SLOT_SIZE[index]);
 
            }