[5/7] sim: unify debug/stdio/trace/profile build settings

Message ID 20210607053355.9965-5-vapier@gentoo.org
State New
Headers show
Series
  • [1/7] sim: unify platform function & header tests
Related show

Commit Message

Mike Frysinger via Gdb-patches June 7, 2021, 5:33 a.m.
Move these options up to the common dir so we only test & export
them once across all ports.
---
 sim/Makefile.in               |   4 +
 sim/aarch64/config.in         |  18 -----
 sim/aarch64/configure         | 134 +---------------------------------
 sim/aclocal.m4                |   4 +
 sim/arm/config.in             |  18 -----
 sim/arm/configure             | 134 +---------------------------------
 sim/avr/config.in             |  18 -----
 sim/avr/configure             | 134 +---------------------------------
 sim/bfin/aclocal.m4           |   4 -
 sim/bfin/config.in            |  18 -----
 sim/bfin/configure            | 134 +---------------------------------
 sim/bpf/config.in             |  18 -----
 sim/bpf/configure             | 134 +---------------------------------
 sim/config.h.in               |  18 +++++
 sim/configure                 | 123 +++++++++++++++++++++++++++++++
 sim/configure.ac              |   6 ++
 sim/cr16/config.in            |  18 -----
 sim/cr16/configure            | 134 +---------------------------------
 sim/cris/config.in            |  18 -----
 sim/cris/configure            | 134 +---------------------------------
 sim/d10v/config.in            |  18 -----
 sim/d10v/configure            | 134 +---------------------------------
 sim/erc32/config.in           |  18 -----
 sim/erc32/configure           | 134 +---------------------------------
 sim/example-synacor/config.in |  18 -----
 sim/example-synacor/configure | 134 +---------------------------------
 sim/frv/config.in             |  18 -----
 sim/frv/configure             | 134 +---------------------------------
 sim/ft32/config.in            |  18 -----
 sim/ft32/configure            | 134 +---------------------------------
 sim/h8300/config.in           |  18 -----
 sim/h8300/configure           | 134 +---------------------------------
 sim/iq2000/config.in          |  18 -----
 sim/iq2000/configure          | 134 +---------------------------------
 sim/lm32/config.in            |  18 -----
 sim/lm32/configure            | 134 +---------------------------------
 sim/m32c/config.in            |  18 -----
 sim/m32c/configure            | 134 +---------------------------------
 sim/m32r/config.in            |  18 -----
 sim/m32r/configure            | 134 +---------------------------------
 sim/m4/sim_ac_common.m4       |  16 ----
 sim/m68hc11/config.in         |  18 -----
 sim/m68hc11/configure         | 134 +---------------------------------
 sim/mcore/config.in           |  18 -----
 sim/mcore/configure           | 134 +---------------------------------
 sim/microblaze/config.in      |  18 -----
 sim/microblaze/configure      | 134 +---------------------------------
 sim/mips/config.in            |  18 -----
 sim/mips/configure            | 134 +---------------------------------
 sim/mn10300/config.in         |  18 -----
 sim/mn10300/configure         | 134 +---------------------------------
 sim/moxie/config.in           |  18 -----
 sim/moxie/configure           | 134 +---------------------------------
 sim/msp430/config.in          |  18 -----
 sim/msp430/configure          | 134 +---------------------------------
 sim/or1k/config.in            |  18 -----
 sim/or1k/configure            | 134 +---------------------------------
 sim/pru/config.in             |  18 -----
 sim/pru/configure             | 134 +---------------------------------
 sim/riscv/config.in           |  18 -----
 sim/riscv/configure           | 134 +---------------------------------
 sim/rl78/config.in            |  18 -----
 sim/rl78/configure            | 134 +---------------------------------
 sim/rx/config.in              |  18 -----
 sim/rx/configure              | 134 +---------------------------------
 sim/sh/config.in              |  18 -----
 sim/sh/configure              | 134 +---------------------------------
 sim/v850/config.in            |  18 -----
 sim/v850/configure            | 134 +---------------------------------
 69 files changed, 217 insertions(+), 4670 deletions(-)

-- 
2.31.1

Patch

diff --git a/sim/configure.ac b/sim/configure.ac
index ecf12b57a19b..d8c6f2d4feb4 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -99,8 +99,14 @@  if test "${enable_sim}" != no; then
 fi
 AM_CONDITIONAL([SIM_ENABLE_IGEN], [test "$sim_igen" = "yes"])
 
+dnl Standard (and optional) simulator options.
+dnl Eventually all simulators will support these.
 SIM_AC_OPTION_ASSERT
+SIM_AC_OPTION_DEBUG
 SIM_AC_OPTION_ENVIRONMENT
+SIM_AC_OPTION_PROFILE
+SIM_AC_OPTION_STDIO
+SIM_AC_OPTION_TRACE
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
index 353855707ad7..0f687dc7bc58 100644
--- a/sim/m4/sim_ac_common.m4
+++ b/sim/m4/sim_ac_common.m4
@@ -54,26 +54,10 @@  AM_CONDITIONAL(PLUGINS, test "$plugins" = yes)
 LT_INIT([dlopen])
 AC_SUBST(lt_cv_dlopen_libs)
 
-dnl Standard (and optional) simulator options.
-dnl Eventually all simulators will support these.
-dnl Do not add any here that cannot be supported by all simulators.
-dnl Do not add similar but different options to a particular simulator,
-dnl all shall eventually behave the same way.
-
-
 dnl We don't use automake, but we still want to support
 dnl --enable-maintainer-mode.
 AM_MAINTAINER_MODE
 
-
-SIM_AC_OPTION_DEBUG
-
-SIM_AC_OPTION_STDIO
-
-SIM_AC_OPTION_TRACE
-
-SIM_AC_OPTION_PROFILE
-
 SIM_AC_OPTION_INLINE
 
 ACX_PKGVERSION([SIM])