Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Simon Marchi via Gdb-patches <gdb-patches@sourceware.org>
To: gdb-patches@sourceware.org
Subject: [PATCH] sim: use -Werror when probing for supported warning flags
Date: Wed, 21 Apr 2021 14:51:10 -0400	[thread overview]
Message-ID: <20210421185110.2788705-1-simon.marchi@polymtl.ca> (raw)

When building with clang, we get:

    error: unknown warning option '-Wmissing-parameter-type' [-Werror,-Wunknown-warning-option]

This is because clang only warns by default when encountering an unknown
warning option, and the probe for supported warning flags is done
without -Werror.  All flags are therefore accepted by configure, but
then it breaks when actually compiling a source file with -Werror.

This is equivalent to this commit in gdb:

    3e019bdc20eb81b91ab5bc774386201b874c0bac
    gdb: Use -Werror when checking for (un)supported warning flags

We then see some other compilation errors when building with clang and
-Werror, they can be dealt with later.

sim/ChangeLog:

	* m4/sim_ac_option_warnings.m4 (SIM_AC_OPTION_WARNINGS):
	Use -Werror when probing for supported warning flags.
	Re-generate all sim configury.

Change-Id: I18dde0e532814084330c54a2f3dfd77d1bb68390
---
 sim/aarch64/aclocal.m4           | 18 +++++++++---------
 sim/aarch64/configure            |  2 +-
 sim/arm/aclocal.m4               | 18 +++++++++---------
 sim/arm/configure                |  2 +-
 sim/avr/aclocal.m4               | 18 +++++++++---------
 sim/avr/configure                |  2 +-
 sim/bfin/aclocal.m4              | 22 +++++++++++-----------
 sim/bfin/configure               |  2 +-
 sim/bpf/aclocal.m4               | 24 ++++++++++++------------
 sim/bpf/configure                |  2 +-
 sim/cr16/aclocal.m4              | 18 +++++++++---------
 sim/cr16/configure               |  2 +-
 sim/cris/aclocal.m4              | 24 ++++++++++++------------
 sim/cris/configure               |  2 +-
 sim/d10v/aclocal.m4              | 18 +++++++++---------
 sim/d10v/configure               |  2 +-
 sim/erc32/aclocal.m4             | 14 +++++++-------
 sim/erc32/configure              |  2 +-
 sim/example-synacor/aclocal.m4   | 18 +++++++++---------
 sim/example-synacor/configure    |  2 +-
 sim/frv/aclocal.m4               | 24 ++++++++++++------------
 sim/frv/configure                |  2 +-
 sim/ft32/aclocal.m4              | 18 +++++++++---------
 sim/ft32/configure               |  2 +-
 sim/h8300/aclocal.m4             | 18 +++++++++---------
 sim/h8300/configure              |  2 +-
 sim/iq2000/aclocal.m4            | 24 ++++++++++++------------
 sim/iq2000/configure             |  2 +-
 sim/lm32/aclocal.m4              | 24 ++++++++++++------------
 sim/lm32/configure               |  2 +-
 sim/m32c/aclocal.m4              | 14 +++++++-------
 sim/m32c/configure               |  2 +-
 sim/m32r/aclocal.m4              | 24 ++++++++++++------------
 sim/m32r/configure               |  2 +-
 sim/m4/sim_ac_option_warnings.m4 |  2 +-
 sim/m68hc11/aclocal.m4           | 20 ++++++++++----------
 sim/m68hc11/configure            |  2 +-
 sim/mcore/aclocal.m4             | 18 +++++++++---------
 sim/mcore/configure              |  2 +-
 sim/microblaze/aclocal.m4        | 18 +++++++++---------
 sim/microblaze/configure         |  2 +-
 sim/mips/aclocal.m4              | 24 ++++++++++++------------
 sim/mips/configure               |  2 +-
 sim/mn10300/aclocal.m4           | 24 ++++++++++++------------
 sim/mn10300/configure            |  2 +-
 sim/moxie/aclocal.m4             | 18 +++++++++---------
 sim/moxie/configure              |  2 +-
 sim/msp430/aclocal.m4            | 18 +++++++++---------
 sim/msp430/configure             |  2 +-
 sim/or1k/aclocal.m4              | 24 ++++++++++++------------
 sim/or1k/configure               |  2 +-
 sim/pru/aclocal.m4               | 18 +++++++++---------
 sim/pru/configure                |  2 +-
 sim/riscv/aclocal.m4             | 22 +++++++++++-----------
 sim/riscv/configure              |  2 +-
 sim/rl78/aclocal.m4              | 14 +++++++-------
 sim/rl78/configure               |  2 +-
 sim/rx/aclocal.m4                | 14 +++++++-------
 sim/rx/configure                 |  2 +-
 sim/sh/aclocal.m4                | 18 +++++++++---------
 sim/sh/configure                 |  2 +-
 sim/v850/aclocal.m4              | 22 +++++++++++-----------
 sim/v850/configure               |  2 +-
 63 files changed, 337 insertions(+), 337 deletions(-)

diff --git a/sim/aarch64/aclocal.m4 b/sim/aarch64/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/aarch64/aclocal.m4
+++ b/sim/aarch64/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/aarch64/configure b/sim/aarch64/configure
index d6b6477c9cc2..5148aec3634d 100755
--- a/sim/aarch64/configure
+++ b/sim/aarch64/configure
@@ -12076,7 +12076,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/arm/aclocal.m4 b/sim/arm/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/arm/aclocal.m4
+++ b/sim/arm/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/arm/configure b/sim/arm/configure
index 8715cd4ba8e6..c52ce0852578 100755
--- a/sim/arm/configure
+++ b/sim/arm/configure
@@ -12072,7 +12072,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/avr/aclocal.m4 b/sim/avr/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/avr/aclocal.m4
+++ b/sim/avr/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/avr/configure b/sim/avr/configure
index 461f80a181bd..7484bd8fe264 100755
--- a/sim/avr/configure
+++ b/sim/avr/configure
@@ -12072,7 +12072,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4
index f096a6412cad..9337e85b4850 100644
--- a/sim/bfin/aclocal.m4
+++ b/sim/bfin/aclocal.m4
@@ -98,17 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_default_model.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -122,3 +111,14 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_default_model.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_hardware.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/bfin/configure b/sim/bfin/configure
index 35ddcc9de834..6ed43afbff40 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -12124,7 +12124,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4
index eab07e35c2c1..73a795c9e9d4 100644
--- a/sim/bpf/aclocal.m4
+++ b/sim/bpf/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/bpf/configure b/sim/bpf/configure
index c6c447c6dab1..5c0244b3260f 100755
--- a/sim/bpf/configure
+++ b/sim/bpf/configure
@@ -12176,7 +12176,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/cr16/aclocal.m4 b/sim/cr16/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/cr16/aclocal.m4
+++ b/sim/cr16/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/cr16/configure b/sim/cr16/configure
index 8c280997a0ac..2355502cec7f 100755
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@@ -12073,7 +12073,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4
index 116cb98347a3..e144fa342655 100644
--- a/sim/cris/aclocal.m4
+++ b/sim/cris/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/cris/configure b/sim/cris/configure
index a1f694714ab1..04542557a065 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -12114,7 +12114,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/d10v/aclocal.m4 b/sim/d10v/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/d10v/aclocal.m4
+++ b/sim/d10v/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/d10v/configure b/sim/d10v/configure
index cb57e7f9bd6c..4ff527a76df5 100755
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@@ -12073,7 +12073,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/erc32/aclocal.m4 b/sim/erc32/aclocal.m4
index 361c39e10f82..db8c5cd5c13a 100644
--- a/sim/erc32/aclocal.m4
+++ b/sim/erc32/aclocal.m4
@@ -98,13 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -117,3 +110,10 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/erc32/configure b/sim/erc32/configure
index b31ddda871fc..e67b3999178f 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -11973,7 +11973,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/example-synacor/aclocal.m4 b/sim/example-synacor/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/example-synacor/aclocal.m4
+++ b/sim/example-synacor/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/example-synacor/configure b/sim/example-synacor/configure
index 1ee8fb721cf0..6b321e868087 100755
--- a/sim/example-synacor/configure
+++ b/sim/example-synacor/configure
@@ -12073,7 +12073,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4
index 116cb98347a3..e144fa342655 100644
--- a/sim/frv/aclocal.m4
+++ b/sim/frv/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/frv/configure b/sim/frv/configure
index 271425735073..771d4de8b1e0 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -12121,7 +12121,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/ft32/aclocal.m4 b/sim/ft32/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/ft32/aclocal.m4
+++ b/sim/ft32/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/ft32/configure b/sim/ft32/configure
index 106c409d6a43..800ffc2cbdf5 100755
--- a/sim/ft32/configure
+++ b/sim/ft32/configure
@@ -12072,7 +12072,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/h8300/aclocal.m4 b/sim/h8300/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/h8300/aclocal.m4
+++ b/sim/h8300/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/h8300/configure b/sim/h8300/configure
index c3fc7833e00f..a5afa6477662 100755
--- a/sim/h8300/configure
+++ b/sim/h8300/configure
@@ -12070,7 +12070,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4
index 116cb98347a3..e144fa342655 100644
--- a/sim/iq2000/aclocal.m4
+++ b/sim/iq2000/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index 5a3021ae1e6c..0606552c3a20 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -12118,7 +12118,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4
index 116cb98347a3..e144fa342655 100644
--- a/sim/lm32/aclocal.m4
+++ b/sim/lm32/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/lm32/configure b/sim/lm32/configure
index 737d82848d44..6976af136bc1 100755
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -12118,7 +12118,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/m32c/aclocal.m4 b/sim/m32c/aclocal.m4
index 361c39e10f82..db8c5cd5c13a 100644
--- a/sim/m32c/aclocal.m4
+++ b/sim/m32c/aclocal.m4
@@ -98,13 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -117,3 +110,10 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/m32c/configure b/sim/m32c/configure
index 0b069353d9c4..c271c4bbf4bc 100755
--- a/sim/m32c/configure
+++ b/sim/m32c/configure
@@ -11976,7 +11976,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4
index 116cb98347a3..e144fa342655 100644
--- a/sim/m32r/aclocal.m4
+++ b/sim/m32r/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/m32r/configure b/sim/m32r/configure
index ec5f8f7b8fe8..2cf5b41192db 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -12120,7 +12120,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/m4/sim_ac_option_warnings.m4 b/sim/m4/sim_ac_option_warnings.m4
index dc9837061e1b..c831fa82596d 100644
--- a/sim/m4/sim_ac_option_warnings.m4
+++ b/sim/m4/sim_ac_option_warnings.m4
@@ -91,7 +91,7 @@ then
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    AC_TRY_COMPILE([],[],WARN_CFLAGS="${WARN_CFLAGS} $w",)
 	    CFLAGS="$saved_CFLAGS"
 	esac
diff --git a/sim/m68hc11/aclocal.m4 b/sim/m68hc11/aclocal.m4
index 2438413714be..4300d0eac67d 100644
--- a/sim/m68hc11/aclocal.m4
+++ b/sim/m68hc11/aclocal.m4
@@ -98,16 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -120,3 +110,13 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_hardware.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index 1e465b391df5..0a274cab136d 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -12072,7 +12072,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/mcore/aclocal.m4 b/sim/mcore/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/mcore/aclocal.m4
+++ b/sim/mcore/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/mcore/configure b/sim/mcore/configure
index 5fac5b82177e..a4881e9fffe4 100755
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@@ -12069,7 +12069,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/microblaze/aclocal.m4 b/sim/microblaze/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/microblaze/aclocal.m4
+++ b/sim/microblaze/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/microblaze/configure b/sim/microblaze/configure
index 8715cd4ba8e6..c52ce0852578 100755
--- a/sim/microblaze/configure
+++ b/sim/microblaze/configure
@@ -12072,7 +12072,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4
index d524b5d0aef6..5573dade0bb1 100644
--- a/sim/mips/aclocal.m4
+++ b/sim/mips/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_reserved_bits.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/mips/configure b/sim/mips/configure
index e0612f7931fc..72e1ee3ff49c 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -12057,7 +12057,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4
index 17cbdb340681..02c11131338a 100644
--- a/sim/mn10300/aclocal.m4
+++ b/sim/mn10300/aclocal.m4
@@ -98,18 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_bitsize.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_hardware.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_reserved_bits.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -122,3 +110,15 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_bitsize.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_hardware.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_reserved_bits.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index ef463cb1616c..5dc101594389 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -12078,7 +12078,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/moxie/aclocal.m4 b/sim/moxie/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/moxie/aclocal.m4
+++ b/sim/moxie/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/moxie/configure b/sim/moxie/configure
index d507c4eb0dda..9ef29a627721 100755
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@@ -12167,7 +12167,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/msp430/aclocal.m4 b/sim/msp430/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/msp430/aclocal.m4
+++ b/sim/msp430/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/msp430/configure b/sim/msp430/configure
index 461f80a181bd..7484bd8fe264 100755
--- a/sim/msp430/configure
+++ b/sim/msp430/configure
@@ -12072,7 +12072,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4
index eab07e35c2c1..73a795c9e9d4 100644
--- a/sim/or1k/aclocal.m4
+++ b/sim/or1k/aclocal.m4
@@ -98,6 +98,18 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
+m4_include([../../config/acx.m4])
+m4_include([../../config/depstand.m4])
+m4_include([../../config/gettext-sister.m4])
+m4_include([../../config/lead-dot.m4])
+m4_include([../../config/override.m4])
+m4_include([../../config/plugins.m4])
+m4_include([../../config/zlib.m4])
+m4_include([../../libtool.m4])
+m4_include([../../ltoptions.m4])
+m4_include([../../ltsugar.m4])
+m4_include([../../ltversion.m4])
+m4_include([../../lt~obsolete.m4])
 m4_include([../m4/sim_ac_common.m4])
 m4_include([../m4/sim_ac_option_alignment.m4])
 m4_include([../m4/sim_ac_option_assert.m4])
@@ -111,15 +123,3 @@ m4_include([../m4/sim_ac_option_scache.m4])
 m4_include([../m4/sim_ac_option_warnings.m4])
 m4_include([../m4/sim_ac_output.m4])
 m4_include([../m4/sim_ac_toolchain.m4])
-m4_include([../../config/acx.m4])
-m4_include([../../config/depstand.m4])
-m4_include([../../config/gettext-sister.m4])
-m4_include([../../config/lead-dot.m4])
-m4_include([../../config/override.m4])
-m4_include([../../config/plugins.m4])
-m4_include([../../config/zlib.m4])
-m4_include([../../libtool.m4])
-m4_include([../../ltoptions.m4])
-m4_include([../../ltsugar.m4])
-m4_include([../../ltversion.m4])
-m4_include([../../lt~obsolete.m4])
diff --git a/sim/or1k/configure b/sim/or1k/configure
index 602f66c7f511..e8d52662638d 100755
--- a/sim/or1k/configure
+++ b/sim/or1k/configure
@@ -12176,7 +12176,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/pru/aclocal.m4
+++ b/sim/pru/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/pru/configure b/sim/pru/configure
index 461f80a181bd..7484bd8fe264 100755
--- a/sim/pru/configure
+++ b/sim/pru/configure
@@ -12072,7 +12072,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4
index 539933d6725f..bc1ef4630603 100644
--- a/sim/riscv/aclocal.m4
+++ b/sim/riscv/aclocal.m4
@@ -98,17 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_bitsize.m4])
-m4_include([../m4/sim_ac_option_default_model.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -121,3 +110,14 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_bitsize.m4])
+m4_include([../m4/sim_ac_option_default_model.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/riscv/configure b/sim/riscv/configure
index 99199aaac783..58c30a7ee667 100755
--- a/sim/riscv/configure
+++ b/sim/riscv/configure
@@ -12099,7 +12099,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4
index 361c39e10f82..db8c5cd5c13a 100644
--- a/sim/rl78/aclocal.m4
+++ b/sim/rl78/aclocal.m4
@@ -98,13 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -117,3 +110,10 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/rl78/configure b/sim/rl78/configure
index 7ad7eac31d14..7e7796b3f0ec 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -11970,7 +11970,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/rx/aclocal.m4 b/sim/rx/aclocal.m4
index 361c39e10f82..db8c5cd5c13a 100644
--- a/sim/rx/aclocal.m4
+++ b/sim/rx/aclocal.m4
@@ -98,13 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -117,3 +110,10 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/rx/configure b/sim/rx/configure
index ab2f25dd5414..bd0a3152b899 100755
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -12016,7 +12016,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/sh/aclocal.m4 b/sim/sh/aclocal.m4
index 78a048914e5a..ddeb1f56430d 100644
--- a/sim/sh/aclocal.m4
+++ b/sim/sh/aclocal.m4
@@ -98,15 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -119,3 +110,12 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/sh/configure b/sim/sh/configure
index 5fac5b82177e..a4881e9fffe4 100755
--- a/sim/sh/configure
+++ b/sim/sh/configure
@@ -12069,7 +12069,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/sim/v850/aclocal.m4 b/sim/v850/aclocal.m4
index e798f0b5c86c..a0d32d4c12ba 100644
--- a/sim/v850/aclocal.m4
+++ b/sim/v850/aclocal.m4
@@ -98,17 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE])
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
-m4_include([../m4/sim_ac_common.m4])
-m4_include([../m4/sim_ac_option_alignment.m4])
-m4_include([../m4/sim_ac_option_assert.m4])
-m4_include([../m4/sim_ac_option_bitsize.m4])
-m4_include([../m4/sim_ac_option_endian.m4])
-m4_include([../m4/sim_ac_option_environment.m4])
-m4_include([../m4/sim_ac_option_inline.m4])
-m4_include([../m4/sim_ac_option_reserved_bits.m4])
-m4_include([../m4/sim_ac_option_warnings.m4])
-m4_include([../m4/sim_ac_output.m4])
-m4_include([../m4/sim_ac_toolchain.m4])
 m4_include([../../config/acx.m4])
 m4_include([../../config/depstand.m4])
 m4_include([../../config/gettext-sister.m4])
@@ -121,3 +110,14 @@ m4_include([../../ltoptions.m4])
 m4_include([../../ltsugar.m4])
 m4_include([../../ltversion.m4])
 m4_include([../../lt~obsolete.m4])
+m4_include([../m4/sim_ac_common.m4])
+m4_include([../m4/sim_ac_option_alignment.m4])
+m4_include([../m4/sim_ac_option_assert.m4])
+m4_include([../m4/sim_ac_option_bitsize.m4])
+m4_include([../m4/sim_ac_option_endian.m4])
+m4_include([../m4/sim_ac_option_environment.m4])
+m4_include([../m4/sim_ac_option_inline.m4])
+m4_include([../m4/sim_ac_option_reserved_bits.m4])
+m4_include([../m4/sim_ac_option_warnings.m4])
+m4_include([../m4/sim_ac_output.m4])
+m4_include([../m4/sim_ac_toolchain.m4])
diff --git a/sim/v850/configure b/sim/v850/configure
index 6dcdb34a7aa1..bc8f8c42ff8b 100755
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -12178,7 +12178,7 @@ $as_echo_n "checking compiler warning flags... " >&6; }
 	-Werr*) WERROR_CFLAGS=-Werror ;;
 	*) # Check that GCC accepts it
 	    saved_CFLAGS="$CFLAGS"
-	    CFLAGS="$CFLAGS $w"
+	    CFLAGS="$CFLAGS -Werror $w"
 	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-- 
2.30.1


             reply	other threads:[~2021-04-21 18:51 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-21 18:51 Simon Marchi via Gdb-patches [this message]
2021-04-21 20:44 ` Mike Frysinger via Gdb-patches
2021-04-21 21:04   ` Simon Marchi via Gdb-patches
2021-04-21 21:13     ` John Baldwin
2021-04-21 21:32       ` Simon Marchi via Gdb-patches
2021-04-21 22:38     ` Mike Frysinger via Gdb-patches
2021-04-21 23:39       ` Simon Marchi via Gdb-patches
2021-04-22  0:43         ` Mike Frysinger via Gdb-patches
2021-04-23  1:57     ` Tom Tromey
2021-04-23  2:04       ` Simon Marchi via Gdb-patches
2021-04-23  2:30         ` Mike Frysinger via Gdb-patches
2021-04-21 23:53 ` Mike Frysinger via Gdb-patches

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210421185110.2788705-1-simon.marchi@polymtl.ca \
    --to=gdb-patches@sourceware.org \
    --cc=simon.marchi@polymtl.ca \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox