sim: enable -Werror by default for some arches

We've had this off for a long time because the sim code was way too full of warnings for it to be feasible. However, I've cleaned things up significantly from when this was first merged, and we can start to turn this around. Change the macro to enable -Werror by default, and allow ports to opt out. New ports will get it automatically (and we can push back on them if they try to turn it off). Also turn it off for the few ports that still hit warnings for me. All the rest will get the new default, and we'll wait for feedback if/when new issues come up.
2021-01-09 01:16:11 -05:00 · 2021-01-09 01:16:11 -05:00 · bf470982f9
commit bf470982f9
parent 0a94990bf6
53 changed files with 140 additions and 116 deletions
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@ -1,3 +1,7 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/aarch64/configure
+++ b/sim/aarch64/configure
@ -13688,11 +13688,9 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi
+  if test "${ERROR_ON_WARNING}" = yes ; then
+    WERROR_CFLAGS="-Werror"
+  fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@ -1,3 +1,7 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/arm/configure
+++ b/sim/arm/configure
@ -13684,11 +13684,9 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi
+  if test "${ERROR_ON_WARNING}" = yes ; then
+    WERROR_CFLAGS="-Werror"
+  fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@ -1,3 +1,7 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/avr/configure
+++ b/sim/avr/configure
@ -13684,11 +13684,9 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi
+  if test "${ERROR_ON_WARNING}" = yes ; then
+    WERROR_CFLAGS="-Werror"
+  fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@ -1,3 +1,7 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@ -13743,11 +13743,9 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi
+  if test "${ERROR_ON_WARNING}" = yes ; then
+    WERROR_CFLAGS="-Werror"
+  fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* acinclude.m4 (SIM_AC_OPTION_WARNINGS): Document 1st argument.
+	Set WERROR_CFLAGS when first arg is not set or is "yes".
+
 2021-01-09  Mike Frysinger  <vapier@gentoo.org>

 	* hw-base.c (full_name_of_hw): Delete full_name.  Replace
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@ -737,6 +737,7 @@ AC_MSG_RESULT($sim_smp)

 dnl --enable-build-warnings is for developers of the simulator.
 dnl it enables extra GCC specific warnings.
+dnl arg[1] Enable -Werror by default? ("yes" or "no")
 AC_DEFUN([SIM_AC_OPTION_WARNINGS],
 [
 AC_ARG_ENABLE(werror,
@ -753,11 +754,11 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi
+m4_if(m4_default([$1], [yes]), [yes], [dnl
+  if test "${ERROR_ON_WARNING}" = yes ; then
+    WERROR_CFLAGS="-Werror"
+  fi
+])dnl

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_WARNINGS): Pass "no".
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@ -13684,11 +13684,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/cr16/configure.ac
+++ b/sim/cr16/configure.ac
@ -6,6 +6,6 @@ SIM_AC_COMMON

 SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_WARNINGS
+SIM_AC_OPTION_WARNINGS(no)

 SIM_AC_OUTPUT
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_WARNINGS): Pass "no".
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/cris/configure
+++ b/sim/cris/configure
@ -13732,11 +13732,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/cris/configure.ac
+++ b/sim/cris/configure.ac
@ -10,7 +10,7 @@ AC_CHECK_HEADERS(sys/socket.h sys/select.h limits.h sys/param.h)
 SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
 SIM_AC_OPTION_SCACHE(16384)
-SIM_AC_OPTION_WARNINGS
+SIM_AC_OPTION_WARNINGS(no)
 SIM_AC_OPTION_HARDWARE(yes,,rv cris cris_900000xx)

 # The default model shouldn't matter as long as there's a BFD.
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_WARNINGS): Pass "no".
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@ -13684,11 +13684,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/d10v/configure.ac
+++ b/sim/d10v/configure.ac
@ -6,6 +6,6 @@ SIM_AC_COMMON

 SIM_AC_OPTION_ENDIAN
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_WARNINGS
+SIM_AC_OPTION_WARNINGS(no)

 SIM_AC_OUTPUT
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@ -1,3 +1,7 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/ft32/configure
+++ b/sim/ft32/configure
@ -13684,11 +13684,9 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi
+  if test "${ERROR_ON_WARNING}" = yes ; then
+    WERROR_CFLAGS="-Werror"
+  fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/igen/ChangeLog
+++ b/sim/igen/ChangeLog
@ -1,3 +1,7 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2021-01-04  Mike Frysinger  <vapier@gentoo.org>

 	* gen-icache.c, igen.c: Include stdlib.h.
--- a/sim/igen/configure
+++ b/sim/igen/configure
@ -4810,11 +4810,9 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi
+  if test "${ERROR_ON_WARNING}" = yes ; then
+    WERROR_CFLAGS="-Werror"
+  fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_WARNINGS): Pass "no".
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/m32c/configure
+++ b/sim/m32c/configure
@ -13586,11 +13586,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/m32c/configure.ac
+++ b/sim/m32c/configure.ac
@ -23,7 +23,7 @@ sinclude(../common/acinclude.m4)

 SIM_AC_COMMON

-SIM_AC_OPTION_WARNINGS
+SIM_AC_OPTION_WARNINGS(no)

 AC_CHECK_HEADERS(sys/select.h termios.h sys/socket.h netinet/in.h netinet/tcp.h)

--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_WARNINGS): Pass "no".
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@ -13687,11 +13687,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/m68hc11/configure.ac
+++ b/sim/m68hc11/configure.ac
@ -7,7 +7,7 @@ SIM_AC_COMMON
 dnl Options available in this module
 SIM_AC_OPTION_ENDIAN(BIG)
 SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_WARNINGS
+SIM_AC_OPTION_WARNINGS(no)

 #
 # Add simulated hardware devices
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_WARNINGS): Pass "no".
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@ -13684,11 +13684,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/mcore/configure.ac
+++ b/sim/mcore/configure.ac
@ -6,6 +6,6 @@ SIM_AC_COMMON

 SIM_AC_OPTION_ENDIAN
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_WARNINGS
+SIM_AC_OPTION_WARNINGS(no)

 SIM_AC_OUTPUT
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@ -1,3 +1,7 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/microblaze/configure
+++ b/sim/microblaze/configure
@ -13684,11 +13684,9 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi
+  if test "${ERROR_ON_WARNING}" = yes ; then
+    WERROR_CFLAGS="-Werror"
+  fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_WARNINGS): Pass "no".
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/mips/configure
+++ b/sim/mips/configure
@ -13672,11 +13672,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@ -6,7 +6,7 @@ SIM_AC_COMMON

 dnl Options available in this module
 SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_WARNINGS
+SIM_AC_OPTION_WARNINGS(no)
 SIM_AC_OPTION_RESERVED_BITS(1)

 # DEPRECATED
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_WARNINGS): Pass "no".
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@ -13693,11 +13693,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/mn10300/configure.ac
+++ b/sim/mn10300/configure.ac
@ -6,7 +6,7 @@ SIM_AC_COMMON

 SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_WARNINGS
+SIM_AC_OPTION_WARNINGS(no)
 SIM_AC_OPTION_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)
 SIM_AC_OPTION_HARDWARE(yes,,mn103cpu mn103int mn103tim mn103ser mn103iop)
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_WARNINGS): Pass "no".
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@ -13778,11 +13778,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/moxie/configure.ac
+++ b/sim/moxie/configure.ac
@ -8,6 +8,6 @@ AC_CHECK_TOOL(DTC, dtc)

 SIM_AC_OPTION_ENDIAN(BIG)
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
-SIM_AC_OPTION_WARNINGS
+SIM_AC_OPTION_WARNINGS(no)

 SIM_AC_OUTPUT
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@ -1,3 +1,7 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/msp430/configure
+++ b/sim/msp430/configure
@ -13697,11 +13697,9 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi
+  if test "${ERROR_ON_WARNING}" = yes ; then
+    WERROR_CFLAGS="-Werror"
+  fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/pru/ChangeLog
+++ b/sim/pru/ChangeLog
@ -1,3 +1,7 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2021-01-09  Mike Frysinger  <vapier@gentoo.org>

 	* sim-main.h: Include config.h.
--- a/sim/pru/configure
+++ b/sim/pru/configure
@ -13684,11 +13684,9 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi
+  if test "${ERROR_ON_WARNING}" = yes ; then
+    WERROR_CFLAGS="-Werror"
+  fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_WARNINGS): Pass "no".
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/sh/configure
+++ b/sim/sh/configure
@ -13684,11 +13684,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/sh/configure.ac
+++ b/sim/sh/configure.ac
@ -6,6 +6,6 @@ SIM_AC_COMMON

 SIM_AC_OPTION_ENDIAN
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_WARNINGS
+SIM_AC_OPTION_WARNINGS(no)

 SIM_AC_OUTPUT
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@ -1,3 +1,8 @@
+2021-01-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_WARNINGS): Pass "no".
+	* configure: Regenerate.
+
 2021-01-08  Mike Frysinger  <vapier@gentoo.org>

 	* configure: Regenerate.
--- a/sim/v850/configure
+++ b/sim/v850/configure
@ -13690,11 +13690,6 @@ if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
 fi

 WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
-# NOTE: Disabled in the sim dir due to most sims generating warnings.
-#    WERROR_CFLAGS="-Werror"
-     true
-fi

 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wpointer-sign \
--- a/sim/v850/configure.ac
+++ b/sim/v850/configure.ac
@ -6,7 +6,7 @@ SIM_AC_COMMON

 SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(,NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_WARNINGS
+SIM_AC_OPTION_WARNINGS(no)
 SIM_AC_OPTION_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)