From 47ce766a8b922377425cfa88189acb1d43ca58af Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 18 Jun 2021 01:14:39 -0400
Subject: sim: unify -Werror build settings
Move these options up to the common dir so we only test & export
them once across all ports. It also enables -Werror usage on the
common files we've been pulling out of arch subdirs.
---
sim/ppc/ChangeLog | 6 ++++++
sim/ppc/Makefile.in | 1 -
sim/ppc/configure | 25 -------------------------
sim/ppc/configure.ac | 22 ----------------------
4 files changed, 6 insertions(+), 48 deletions(-)
(limited to 'sim/ppc')
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 9f4f58b..c5af4c8 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,5 +1,11 @@
2021-06-18 Mike Frysinger <vapier@gentoo.org>
+ * Makefile.in (WERROR_CFLAGS): Delete.
+ * configure.ac: Delete werror configure option.
+ * configure: Regenerate.
+
+2021-06-18 Mike Frysinger <vapier@gentoo.org>
+
* Makefile.in: Include ../arch-subdir.mk.
2021-06-18 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index b4cb587..695b0f1 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -67,7 +67,6 @@ AR = @AR@
AR_FLAGS = rc
CC = @CC@
CFLAGS = @CFLAGS@
-WERROR_CFLAGS = @WERROR_CFLAGS@
CC_FOR_BUILD = @CC_FOR_BUILD@
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
BISON = bison
diff --git a/sim/ppc/configure b/sim/ppc/configure
index 930b24a..afd6471 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -675,7 +675,6 @@ build_os
build_vendor
build_cpu
build
-WERROR_CFLAGS
CATOBJEXT
GENCAT
INSTOBJEXT
@@ -761,7 +760,6 @@ enable_sim_reserved_bits
enable_sim_smp
enable_sim_switch
enable_sim_timebase
-enable_werror
enable_sim_warnings
enable_sim_xor_endian
with_system_zlib
@@ -1415,7 +1413,6 @@ Optional Features:
--enable-sim-smp=n Specify number of processors to configure for.
--enable-sim-switch Use a switch instead of a table for instruction call.
--enable-sim-timebase Specify whether the PPC timebase is supported.
- --enable-werror treat compile warnings as errors
--enable-sim-warnings=opts Extra CFLAGS for turning on compiler warnings except for idecode.o, semantics.o and psim.o
--enable-sim-xor-endian=n Specify number bytes involved in PowerPC XOR bi-endian mode (default 8).
--enable-plugins Enable support for plugins
@@ -3715,28 +3712,6 @@ else
fi
-# Check whether --enable-werror was given.
-if test "${enable_werror+set}" = set; then :
- enableval=$enable_werror; case "${enableval}" in
- yes | y) ERROR_ON_WARNING="yes" ;;
- no | n) ERROR_ON_WARNING="no" ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-werror" "$LINENO" 5 ;;
- esac
-fi
-
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
- ERROR_ON_WARNING=yes
-fi
-WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
- WERROR_CFLAGS="-Werror"
-fi
-case "${host}" in
- *-*-mingw32*) WERROR_CFLAGS="$WERROR_CFLAGS -Wno-format" ;;
-esac
-
-
# Check whether --enable-sim-warnings was given.
if test "${enable_sim_warnings+set}" = set; then :
enableval=$enable_sim_warnings; case "${enableval}" in
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 9d294ae..fb0eae6 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -479,28 +479,6 @@ if test x"$silent" != x"yes" && test x"$sim_timebase" != x""; then
fi],[sim_timebase=""])dnl
-AC_ARG_ENABLE(werror,
- AS_HELP_STRING([--enable-werror], [treat compile warnings as errors]),
- [case "${enableval}" in
- yes | y) ERROR_ON_WARNING="yes" ;;
- no | n) ERROR_ON_WARNING="no" ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;;
- esac])
-# Enable -Werror by default when using gcc
-if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
- ERROR_ON_WARNING=yes
-fi
-WERROR_CFLAGS=""
-if test "${ERROR_ON_WARNING}" = yes ; then
- WERROR_CFLAGS="-Werror"
-fi
-dnl Enable -Wno-format by default when using gcc on mingw since many
-dnl GCC versions complain about %I64.
-case "${host}" in
- *-*-mingw32*) WERROR_CFLAGS="$WERROR_CFLAGS -Wno-format" ;;
-esac
-AC_SUBST(WERROR_CFLAGS)
-
AC_ARG_ENABLE(sim-warnings,
[ --enable-sim-warnings=opts Extra CFLAGS for turning on compiler warnings except for idecode.o, semantics.o and psim.o],
[case "${enableval}" in
--
cgit v1.1