public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
* [PATCH 1/5] sim: ppc: rename inline defines to match common code
@ 2021-06-19 20:27 Mike Frysinger
  2021-06-19 20:27 ` [PATCH 2/5] sim: move sim-inline to the " Mike Frysinger
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Mike Frysinger @ 2021-06-19 20:27 UTC (permalink / raw)
  To: gdb-patches

Use the same basic names as the common sim inline logic so we can
merge the two.  We don't do that here, just prepare for it.

The common code seems to be based on the ppc version but with slightly
different names as it was cleaned up & generalized.  I *think* these
concepts are the same, so binding them together is OK, but maybe I'm
misreading them.  If so, can always tweak them later.
	REVEAL_MODULE  ->  H_REVEALS_MODULE
	INLINE_MODULE  ->  C_REVEALS_MODULE
---
 sim/ppc/configure    | 10 +++++-----
 sim/ppc/configure.ac | 10 +++++-----
 sim/ppc/inline.h     | 42 +++++++++++++++++++++---------------------
 sim/ppc/options.c    |  8 ++++----
 sim/ppc/std-config.h | 33 ++++++++++++++++-----------------
 5 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 58c68a110f99..19dbd77bda91 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -275,15 +275,15 @@ AC_ARG_ENABLE(sim-inline,
 case "$enableval" in
   no)		sim_inline="-DDEFAULT_INLINE=0";;
   0)		sim_inline="-DDEFAULT_INLINE=0";;
-  yes | 2)	sim_inline="-DDEFAULT_INLINE=ALL_INLINE";;
-  1)		sim_inline="-DDEFAULT_INLINE=PSIM_INLINE_LOCALS";;
+  yes | 2)	sim_inline="-DDEFAULT_INLINE=ALL_C_INLINE";;
+  1)		sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS";;
   *) for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
        new_flag=""
        case "$x" in
 	 *_INLINE=*)	new_flag="-D$x";;
 	 *=*)		new_flag=`echo "$x" | sed -e "s/=/_INLINE=/" -e "s/^/-D/"`;;
-	 *_INLINE)	new_flag="-D$x=ALL_INLINE";;
-	 *)		new_flag="-D$x""_INLINE=ALL_INLINE";;
+	 *_INLINE)	new_flag="-D$x=ALL_C_INLINE";;
+	 *)		new_flag="-D$x""_INLINE=ALL_C_INLINE";;
        esac
        if test x"$sim_inline" = x""; then
 	 sim_inline="$new_flag"
@@ -295,7 +295,7 @@ esac
 if test x"$silent" != x"yes" && test x"$sim_inline" != x""; then
   echo "Setting inline flags = $sim_inline" 6>&1
 fi],[if test x"$GCC" != ""; then
-  sim_inline="-DDEFAULT_INLINE=PSIM_INLINE_LOCALS"
+  sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS"
   if test x"$silent" != x"yes"; then
     echo "Setting inline flags = $sim_inline" 6>&1
   fi
diff --git a/sim/ppc/inline.h b/sim/ppc/inline.h
index 5fb108f09bba..da0bd5cf7eb7 100644
--- a/sim/ppc/inline.h
+++ b/sim/ppc/inline.h
@@ -41,7 +41,7 @@
 # define EXTERN_PSIM_ENDIAN(TYPE) TYPE
 #endif
 
-#if (SIM_ENDIAN_INLINE & PSIM_INLINE_LOCALS)
+#if (SIM_ENDIAN_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_PSIM_ENDIAN(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_PSIM_ENDIAN(TYPE) static TYPE
@@ -63,7 +63,7 @@
 # define EXTERN_BITS(TYPE) TYPE
 #endif
 
-#if (BITS_INLINE & PSIM_INLINE_LOCALS)
+#if (BITS_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_BITS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_BITS(TYPE) static TYPE
@@ -85,7 +85,7 @@
 # define EXTERN_CORE(TYPE) TYPE
 #endif
 
-#if (CORE_INLINE & PSIM_INLINE_LOCALS)
+#if (CORE_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_CORE(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_CORE(TYPE) static TYPE
@@ -107,7 +107,7 @@
 # define EXTERN_VM(TYPE) TYPE
 #endif
 
-#if (VM_INLINE & PSIM_INLINE_LOCALS)
+#if (VM_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_VM(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_VM(TYPE) static TYPE
@@ -129,7 +129,7 @@
 # define EXTERN_CPU(TYPE) TYPE
 #endif
 
-#if (CPU_INLINE & PSIM_INLINE_LOCALS)
+#if (CPU_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_CPU(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_CPU(TYPE) static TYPE
@@ -151,7 +151,7 @@
 # define EXTERN_MODEL(TYPE) TYPE
 #endif
 
-#if (MODEL_INLINE & PSIM_INLINE_LOCALS)
+#if (MODEL_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_MODEL(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_MODEL(TYPE) static TYPE
@@ -173,7 +173,7 @@
 # define EXTERN_EVENTS(TYPE) TYPE
 #endif
 
-#if (EVENTS_INLINE & PSIM_INLINE_LOCALS)
+#if (EVENTS_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_EVENTS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_EVENTS(TYPE) static TYPE
@@ -195,7 +195,7 @@
 # define EXTERN_MON(TYPE) TYPE
 #endif
 
-#if (MON_INLINE & PSIM_INLINE_LOCALS)
+#if (MON_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_MON(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_MON(TYPE) static TYPE
@@ -217,7 +217,7 @@
 # define EXTERN_REGISTERS(TYPE) TYPE
 #endif
 
-#if (REGISTERS_INLINE & PSIM_INLINE_LOCALS)
+#if (REGISTERS_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_REGISTERS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_REGISTERS(TYPE) static TYPE
@@ -239,7 +239,7 @@
 # define EXTERN_INTERRUPTS(TYPE) TYPE
 #endif
 
-#if (INTERRUPTS_INLINE & PSIM_INLINE_LOCALS)
+#if (INTERRUPTS_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_INTERRUPTS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_INTERRUPTS(TYPE) static TYPE
@@ -261,7 +261,7 @@
 # define EXTERN_DEVICE(TYPE) TYPE
 #endif
 
-#if (DEVICE_INLINE & PSIM_INLINE_LOCALS)
+#if (DEVICE_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_DEVICE(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_DEVICE(TYPE) static TYPE
@@ -283,7 +283,7 @@
 # define EXTERN_TREE(TYPE) TYPE
 #endif
 
-#if (TREE_INLINE & PSIM_INLINE_LOCALS)
+#if (TREE_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_TREE(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_TREE(TYPE) static TYPE
@@ -305,7 +305,7 @@
 # define EXTERN_SPREG(TYPE) TYPE
 #endif
 
-#if (SPREG_INLINE & PSIM_INLINE_LOCALS)
+#if (SPREG_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_SPREG(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_SPREG(TYPE) static TYPE
@@ -328,7 +328,7 @@
 #endif
 
 #if 0 /* this isn't used */
-#if (SEMANTICS_INLINE & PSIM_INLINE_LOCALS)
+#if (SEMANTICS_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_SEMANTICS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_SEMANTICS(TYPE) static TYPE
@@ -352,7 +352,7 @@
 #endif
 
 #if 0 /* this isn't used */
-#if (IDECODE_INLINE & PSIM_INLINE_LOCALS)
+#if (IDECODE_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_IDECODE(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_IDECODE(TYPE) static TYPE
@@ -376,7 +376,7 @@
 #endif
 
 #if 0 /* this isn't used */
-#if (ICACHE_INLINE & PSIM_INLINE_LOCALS)
+#if (ICACHE_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_ICACHE(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_ICACHE(TYPE) static TYPE
@@ -400,7 +400,7 @@
 #endif
 
 #if 0 /* this isn't used */
-#if (SUPPORT_INLINE & PSIM_INLINE_LOCALS)
+#if (SUPPORT_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_SUPPORT(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_SUPPORT(TYPE) static TYPE
@@ -423,7 +423,7 @@
 # define EXTERN_OPTIONS(TYPE) TYPE
 #endif
 
-#if (OPTIONS_INLINE & PSIM_INLINE_LOCALS)
+#if (OPTIONS_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_OPTIONS(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_OPTIONS(TYPE) static TYPE
@@ -445,7 +445,7 @@
 # define EXTERN_OS_EMUL(TYPE) TYPE
 #endif
 
-#if (OS_EMUL_INLINE & PSIM_INLINE_LOCALS)
+#if (OS_EMUL_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_OS_EMUL(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_OS_EMUL(TYPE) static TYPE
@@ -467,7 +467,7 @@
 # define EXTERN_PSIM(TYPE) TYPE
 #endif
 
-#if (PSIM_INLINE & PSIM_INLINE_LOCALS)
+#if (PSIM_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_PSIM(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_PSIM(TYPE) static TYPE
@@ -489,7 +489,7 @@
 # define EXTERN_CAP(TYPE) TYPE
 #endif
 
-#if (CAP_INLINE & PSIM_INLINE_LOCALS)
+#if (CAP_INLINE & INLINE_LOCALS)
 # define STATIC_INLINE_CAP(TYPE) static INLINE TYPE
 #else
 # define STATIC_INLINE_CAP(TYPE) static TYPE
diff --git a/sim/ppc/options.c b/sim/ppc/options.c
index d20fb04e6caa..10ab9731ac0b 100644
--- a/sim/ppc/options.c
+++ b/sim/ppc/options.c
@@ -97,10 +97,10 @@ options_inline (int in)
   case /*1*/ REVEAL_MODULE:			return "REVEAL_MODULE";
   case /*2*/ INLINE_MODULE:			return "INLINE_MODULE";
   case /*3*/ REVEAL_MODULE|INLINE_MODULE:	return "REVEAL_MODULE|INLINE_MODULE";
-  case /*4*/ PSIM_INLINE_LOCALS:		return "PSIM_LOCALS_INLINE";
-  case /*5*/ PSIM_INLINE_LOCALS|REVEAL_MODULE:	return "PSIM_INLINE_LOCALS|REVEAL_MODULE";
-  case /*6*/ PSIM_INLINE_LOCALS|INLINE_MODULE:	return "PSIM_INLINE_LOCALS|INLINE_MODULE";
-  case /*7*/ ALL_INLINE:			return "ALL_INLINE";
+  case /*4*/ INLINE_LOCALS:		return "PSIM_LOCALS_INLINE";
+  case /*5*/ INLINE_LOCALS|REVEAL_MODULE:	return "INLINE_LOCALS|REVEAL_MODULE";
+  case /*6*/ INLINE_LOCALS|INLINE_MODULE:	return "INLINE_LOCALS|INLINE_MODULE";
+  case /*7*/ ALL_C_INLINE:			return "ALL_C_INLINE";
   }
   return "0";
 }
diff --git a/sim/ppc/std-config.h b/sim/ppc/std-config.h
index 7b8f91138597..75aaa5881566 100644
--- a/sim/ppc/std-config.h
+++ b/sim/ppc/std-config.h
@@ -309,7 +309,7 @@ extern int current_stdio;
          the module is included into a file being compiled, calls to
 	 its funtions can be eliminated. 2 implies 1.
 
-      PSIM_INLINE_LOCALS:
+      INLINE_LOCALS:
 
          Make internal (static) functions within the module `inline'.
 
@@ -317,7 +317,7 @@ extern int current_stdio;
 
       INCLUDE_MODULE == (REVEAL_MODULE | INLINE_MODULE)
 
-      ALL_INLINE == (REVEAL_MODULE | INLINE_MODULE | PSIM_INLINE_LOCALS)
+      ALL_C_INLINE == (REVEAL_MODULE | INLINE_MODULE | INLINE_LOCALS)
 
    In addition to this, modules have been put into two categories.
 
@@ -415,11 +415,10 @@ extern int current_stdio;
 
    */
 
-#define REVEAL_MODULE			1
-#define INLINE_MODULE			2
+#include "../common/sim-inline.h"
+#define REVEAL_MODULE			H_REVEALS_MODULE
+#define INLINE_MODULE			C_REVEALS_MODULE
 #define INCLUDE_MODULE			(INLINE_MODULE | REVEAL_MODULE)
-#define PSIM_INLINE_LOCALS			4
-#define ALL_INLINE			7
 
 /* Your compilers inline reserved word */
 
@@ -441,7 +440,7 @@ extern int current_stdio;
 /* Default macro to simplify control several of key the inlines */
 
 #ifndef DEFAULT_INLINE
-#define	DEFAULT_INLINE			PSIM_INLINE_LOCALS
+#define	DEFAULT_INLINE			INLINE_LOCALS
 #endif
 
 /* Code that converts between hosts and target byte order.  Used on
@@ -450,21 +449,21 @@ extern int current_stdio;
    can inline for all callers */
 
 #ifndef SIM_ENDIAN_INLINE
-#define SIM_ENDIAN_INLINE		(DEFAULT_INLINE ? ALL_INLINE : 0)
+#define SIM_ENDIAN_INLINE		(DEFAULT_INLINE ? ALL_C_INLINE : 0)
 #endif
 
 /* Low level bit manipulation routines. This module can inline for all
    callers */
 
 #ifndef BITS_INLINE
-#define BITS_INLINE			(DEFAULT_INLINE ? ALL_INLINE : 0)
+#define BITS_INLINE			(DEFAULT_INLINE ? ALL_C_INLINE : 0)
 #endif
 
 /* Code that gives access to various CPU internals such as registers.
    Used every time an instruction is executed */
 
 #ifndef CPU_INLINE
-#define CPU_INLINE			(DEFAULT_INLINE ? ALL_INLINE : 0)
+#define CPU_INLINE			(DEFAULT_INLINE ? ALL_C_INLINE : 0)
 #endif
 
 /* Code that translates between an effective and real address.  Used
@@ -485,14 +484,14 @@ extern int current_stdio;
    Called once per instruction cycle */
 
 #ifndef EVENTS_INLINE
-#define EVENTS_INLINE			(DEFAULT_INLINE ? ALL_INLINE : 0)
+#define EVENTS_INLINE			(DEFAULT_INLINE ? ALL_C_INLINE : 0)
 #endif
 
 /* Code monotoring the processors performance.  It counts events on
    every instruction cycle */
 
 #ifndef MON_INLINE
-#define MON_INLINE			(DEFAULT_INLINE ? ALL_INLINE : 0)
+#define MON_INLINE			(DEFAULT_INLINE ? ALL_C_INLINE : 0)
 #endif
 
 /* Code called on the rare occasions that an interrupt occures. */
@@ -515,7 +514,7 @@ extern int current_stdio;
    a jump table. */
 
 #ifndef DEVICE_INLINE
-#define DEVICE_INLINE			(DEFAULT_INLINE ? PSIM_INLINE_LOCALS : 0)
+#define DEVICE_INLINE			(DEFAULT_INLINE ? INLINE_LOCALS : 0)
 #endif
 
 /* Code called used while the device tree is being built.
@@ -523,7 +522,7 @@ extern int current_stdio;
    Inlining this is of no benefit */
 
 #ifndef TREE_INLINE
-#define TREE_INLINE			(DEFAULT_INLINE ? PSIM_INLINE_LOCALS : 0)
+#define TREE_INLINE			(DEFAULT_INLINE ? INLINE_LOCALS : 0)
 #endif
 
 /* Code called whenever information on a Special Purpose Register is
@@ -563,7 +562,7 @@ extern int current_stdio;
    code is reduced. */
 
 #ifndef SUPPORT_INLINE
-#define SUPPORT_INLINE			PSIM_INLINE_LOCALS
+#define SUPPORT_INLINE			INLINE_LOCALS
 #endif
 
 /* Model specific code used in simulating functional units.  Note, it actaully
@@ -588,13 +587,13 @@ extern int current_stdio;
    into this file */
 
 #ifndef IDECOCE_INLINE
-#define IDECODE_INLINE			PSIM_INLINE_LOCALS
+#define IDECODE_INLINE			INLINE_LOCALS
 #endif
 
 /* psim, isn't actually inlined */
 
 #ifndef PSIM_INLINE
-#define PSIM_INLINE			PSIM_INLINE_LOCALS
+#define PSIM_INLINE			INLINE_LOCALS
 #endif
 
 /* Code to emulate os or rom compatibility.  This code is called via a
-- 
2.31.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 2/5] sim: move sim-inline to the common code
  2021-06-19 20:27 [PATCH 1/5] sim: ppc: rename inline defines to match common code Mike Frysinger
@ 2021-06-19 20:27 ` Mike Frysinger
  2021-06-19 20:27 ` [PATCH 3/5] sim: unify cgen maintainer settings Mike Frysinger
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2021-06-19 20:27 UTC (permalink / raw)
  To: gdb-patches

This will allow us to build the common code with the same inline
settings as the arch subdirs, and only do the test once.
---
 sim/Makefile.am                |  4 +++-
 sim/Makefile.in                |  4 +++-
 sim/aarch64/aclocal.m4         |  1 -
 sim/aarch64/configure          | 35 ----------------------------
 sim/aclocal.m4                 |  1 +
 sim/arch-subdir.mk.in          |  2 ++
 sim/arm/aclocal.m4             |  1 -
 sim/arm/configure              | 35 ----------------------------
 sim/avr/aclocal.m4             |  1 -
 sim/avr/configure              | 35 ----------------------------
 sim/bfin/aclocal.m4            |  1 -
 sim/bfin/configure             | 35 ----------------------------
 sim/bpf/aclocal.m4             |  1 -
 sim/bpf/configure              | 35 ----------------------------
 sim/common/Make-common.in      |  3 +--
 sim/configure                  | 40 +++++++++++++++++++++++++++++---
 sim/configure.ac               |  1 +
 sim/cr16/aclocal.m4            |  1 -
 sim/cr16/configure             | 35 ----------------------------
 sim/cris/aclocal.m4            |  1 -
 sim/cris/configure             | 35 ----------------------------
 sim/d10v/aclocal.m4            |  1 -
 sim/d10v/configure             | 35 ----------------------------
 sim/erc32/aclocal.m4           |  1 -
 sim/erc32/configure            | 35 ----------------------------
 sim/example-synacor/aclocal.m4 |  1 -
 sim/example-synacor/configure  | 35 ----------------------------
 sim/frv/aclocal.m4             |  1 -
 sim/frv/configure              | 35 ----------------------------
 sim/ft32/aclocal.m4            |  1 -
 sim/ft32/configure             | 35 ----------------------------
 sim/h8300/aclocal.m4           |  1 -
 sim/h8300/configure            | 35 ----------------------------
 sim/iq2000/aclocal.m4          |  1 -
 sim/iq2000/configure           | 35 ----------------------------
 sim/lm32/aclocal.m4            |  1 -
 sim/lm32/configure             | 35 ----------------------------
 sim/m32c/aclocal.m4            |  1 -
 sim/m32c/configure             | 35 ----------------------------
 sim/m32r/aclocal.m4            |  1 -
 sim/m32r/configure             | 35 ----------------------------
 sim/m4/sim_ac_common.m4        |  2 --
 sim/m68hc11/aclocal.m4         |  1 -
 sim/m68hc11/configure          | 35 ----------------------------
 sim/mcore/aclocal.m4           |  1 -
 sim/mcore/configure            | 35 ----------------------------
 sim/microblaze/aclocal.m4      |  1 -
 sim/microblaze/configure       | 35 ----------------------------
 sim/mips/aclocal.m4            |  1 -
 sim/mips/configure             | 35 ----------------------------
 sim/mn10300/aclocal.m4         |  1 -
 sim/mn10300/configure          | 35 ----------------------------
 sim/moxie/aclocal.m4           |  1 -
 sim/moxie/configure            | 35 ----------------------------
 sim/msp430/aclocal.m4          |  1 -
 sim/msp430/configure           | 35 ----------------------------
 sim/or1k/aclocal.m4            |  1 -
 sim/or1k/configure             | 35 ----------------------------
 sim/ppc/Makefile.in            |  2 +-
 sim/ppc/configure              | 42 ----------------------------------
 sim/ppc/configure.ac           | 36 -----------------------------
 sim/pru/aclocal.m4             |  1 -
 sim/pru/configure              | 35 ----------------------------
 sim/riscv/aclocal.m4           |  1 -
 sim/riscv/configure            | 35 ----------------------------
 sim/rl78/aclocal.m4            |  1 -
 sim/rl78/configure             | 35 ----------------------------
 sim/rx/aclocal.m4              |  1 -
 sim/rx/configure               | 35 ----------------------------
 sim/sh/aclocal.m4              |  1 -
 sim/sh/configure               | 35 ----------------------------
 sim/v850/aclocal.m4            |  1 -
 sim/v850/configure             | 35 ----------------------------
 73 files changed, 49 insertions(+), 1204 deletions(-)

diff --git a/sim/Makefile.am b/sim/Makefile.am
index 8d5311456860..aa575798ab7e 100644
--- a/sim/Makefile.am
+++ b/sim/Makefile.am
@@ -36,7 +36,9 @@ DISTCLEANFILES =
 MOSTLYCLEANFILES = core
 
 AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
-AM_CPPFLAGS = -I$(srcroot)/include
+AM_CPPFLAGS = \
+	-I$(srcroot)/include \
+	$(sim_inline)
 
 COMPILE_FOR_BUILD = $(CC_FOR_BUILD) $(AM_CPPFLAGS) $(CFLAGS_FOR_BUILD)
 LINK_FOR_BUILD = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in
index 8128a27971d7..a176cf97acf0 100644
--- a/sim/arch-subdir.mk.in
+++ b/sim/arch-subdir.mk.in
@@ -52,3 +52,5 @@ INTL_CFLAGS = @INCINTL@
 COMMON_LIBS = @LIBS@
 WARN_CFLAGS = @WARN_CFLAGS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
+
+sim_inline = @sim_inline@
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 80e45c761830..6d4f47d354b3 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -75,7 +75,6 @@ SIM_FLOAT = @sim_float@
 SIM_HW_CFLAGS = @sim_hw_cflags@
 SIM_HW_OBJS = @sim_hw_objs@
 SIM_HW = @sim_hw@
-SIM_INLINE = @sim_inline@
 SIM_RESERVED_BITS = @sim_reserved_bits@
 SIM_SCACHE = @sim_scache@
 SIM_WARN_CFLAGS = $(WARN_CFLAGS)
@@ -200,7 +199,7 @@ CONFIG_CFLAGS = \
 	$(SIM_BITSIZE) \
 	$(SIM_FLOAT) \
 	$(SIM_HW_CFLAGS) \
-	$(SIM_INLINE) \
+	$(sim_inline) \
 	$(SIM_RESERVED_BITS) \
 	$(SIM_SCACHE) \
 	$(SIM_WARN_CFLAGS) \
diff --git a/sim/configure.ac b/sim/configure.ac
index 33c7aca60f5a..a3f02a78e9a7 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -121,6 +121,7 @@ SIM_AC_OPTION_ASSERT
 SIM_AC_OPTION_DEBUG
 SIM_AC_OPTION_ENDIAN
 SIM_AC_OPTION_ENVIRONMENT
+SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_PROFILE
 SIM_AC_OPTION_STDIO
 SIM_AC_OPTION_TRACE
diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
index 26d0eefdc35c..658789581471 100644
--- a/sim/m4/sim_ac_common.m4
+++ b/sim/m4/sim_ac_common.m4
@@ -24,6 +24,4 @@ AC_DEFUN([SIM_AC_COMMON],
 dnl We don't use automake, but we still want to support
 dnl --enable-maintainer-mode.
 AM_MAINTAINER_MODE
-
-SIM_AC_OPTION_INLINE
 ]) dnl End of SIM_AC_COMMON
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index a621e9940119..1c8a119c739f 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -58,7 +58,7 @@ SHELL = /bin/sh
 BISON = bison
 MAKEINFO = makeinfo
 
-INLINE_CFLAGS = @sim_inline@
+INLINE_CFLAGS = $(sim_inline)
 SMP_CFLAGS = @sim_smp@
 XOR_ENDIAN_CFLAGS = @sim_xor_endian@
 BITSIZE_CFLAGS = @sim_bitsize@
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 19dbd77bda91..30952f30a4af 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -269,41 +269,6 @@ if test x"$silent" != x"yes"; then
 fi])dnl
 
 
-AC_ARG_ENABLE(sim-inline,
-[  --enable-sim-inline=inlines		Specify which functions should be inlined.],
-[sim_inline=""
-case "$enableval" in
-  no)		sim_inline="-DDEFAULT_INLINE=0";;
-  0)		sim_inline="-DDEFAULT_INLINE=0";;
-  yes | 2)	sim_inline="-DDEFAULT_INLINE=ALL_C_INLINE";;
-  1)		sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS";;
-  *) for x in `echo "$enableval" | sed -e "s/,/ /g"`; do
-       new_flag=""
-       case "$x" in
-	 *_INLINE=*)	new_flag="-D$x";;
-	 *=*)		new_flag=`echo "$x" | sed -e "s/=/_INLINE=/" -e "s/^/-D/"`;;
-	 *_INLINE)	new_flag="-D$x=ALL_C_INLINE";;
-	 *)		new_flag="-D$x""_INLINE=ALL_C_INLINE";;
-       esac
-       if test x"$sim_inline" = x""; then
-	 sim_inline="$new_flag"
-       else
-	 sim_inline="$sim_inline $new_flag"
-       fi
-     done;;
-esac
-if test x"$silent" != x"yes" && test x"$sim_inline" != x""; then
-  echo "Setting inline flags = $sim_inline" 6>&1
-fi],[if test x"$GCC" != ""; then
-  sim_inline="-DDEFAULT_INLINE=INLINE_LOCALS"
-  if test x"$silent" != x"yes"; then
-    echo "Setting inline flags = $sim_inline" 6>&1
-  fi
-else
-  sim_inline=""
-fi])dnl
-
-
 AC_ARG_ENABLE(sim-jump,
 [  --enable-sim-jump		Jump between semantic code (instead of call/return).],
 [case "${enableval}" in
@@ -693,7 +658,6 @@ AC_SUBST(sim_hw_src)
 AC_SUBST(sim_hw_obj)
 AC_SUBST(sim_pk_src)
 AC_SUBST(sim_pk_obj)
-AC_SUBST(sim_inline)
 AC_SUBST(sim_xor_endian)
 AC_SUBST(sim_smp)
 AC_SUBST(sim_igen_smp)
-- 
2.31.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 3/5] sim: unify cgen maintainer settings
  2021-06-19 20:27 [PATCH 1/5] sim: ppc: rename inline defines to match common code Mike Frysinger
  2021-06-19 20:27 ` [PATCH 2/5] sim: move sim-inline to the " Mike Frysinger
@ 2021-06-19 20:27 ` Mike Frysinger
  2021-06-19 20:27 ` [PATCH 4/5] sim: unify general " Mike Frysinger
  2021-06-19 20:27 ` [PATCH 5/5] sim: delete SIM_AC_COMMON macro Mike Frysinger
  3 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2021-06-19 20:27 UTC (permalink / raw)
  To: gdb-patches

Move these options up to the common dir so we only test & export
them once across all ports.  It makes it available to targets that
aren't cgen-based, but those will just ignore the settings, so it
shouldn't be an issue.
---
 sim/Makefile.in         |  4 ++++
 sim/aclocal.m4          |  1 +
 sim/arch-subdir.mk.in   |  5 +++++
 sim/bpf/Makefile.in     |  5 -----
 sim/bpf/aclocal.m4      |  1 -
 sim/bpf/configure       | 38 -------------------------------------
 sim/bpf/configure.ac    |  1 -
 sim/configure           | 42 +++++++++++++++++++++++++++++++++++++++--
 sim/configure.ac        |  1 +
 sim/cris/Makefile.in    |  5 -----
 sim/cris/aclocal.m4     |  1 -
 sim/cris/configure      | 38 -------------------------------------
 sim/cris/configure.ac   |  1 -
 sim/frv/Makefile.in     |  5 -----
 sim/frv/aclocal.m4      |  1 -
 sim/frv/configure       | 38 -------------------------------------
 sim/frv/configure.ac    |  1 -
 sim/iq2000/Makefile.in  |  5 -----
 sim/iq2000/aclocal.m4   |  1 -
 sim/iq2000/configure    | 38 -------------------------------------
 sim/iq2000/configure.ac |  1 -
 sim/lm32/Makefile.in    |  5 -----
 sim/lm32/aclocal.m4     |  1 -
 sim/lm32/configure      | 38 -------------------------------------
 sim/lm32/configure.ac   |  1 -
 sim/m32r/Makefile.in    |  5 -----
 sim/m32r/aclocal.m4     |  1 -
 sim/m32r/configure      | 38 -------------------------------------
 sim/m32r/configure.ac   |  1 -
 sim/or1k/Makefile.in    |  5 -----
 sim/or1k/aclocal.m4     |  1 -
 sim/or1k/configure      | 38 -------------------------------------
 sim/or1k/configure.ac   |  1 -
 33 files changed, 51 insertions(+), 317 deletions(-)

diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in
index a176cf97acf0..6922b9719f39 100644
--- a/sim/arch-subdir.mk.in
+++ b/sim/arch-subdir.mk.in
@@ -53,4 +53,9 @@ COMMON_LIBS = @LIBS@
 WARN_CFLAGS = @WARN_CFLAGS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
 
+# cgen support, enable with --enable-cgen-maint
+CGEN_MAINT = ; @true
+# The following line is commented in or out depending upon --enable-cgen-maint.
+@CGEN_MAINT@CGEN_MAINT =
+
 sim_inline = @sim_inline@
diff --git a/sim/bpf/Makefile.in b/sim/bpf/Makefile.in
index d165febdd34b..c48c37837e6e 100644
--- a/sim/bpf/Makefile.in
+++ b/sim/bpf/Makefile.in
@@ -46,11 +46,6 @@ SIM_WERROR_CFLAGS =
 
 ## COMMON_POST_CONFIG_FRAG
 
-# cgen support, enable with --enable-cgen-maint
-CGEN_MAINT = ; @true
-# The following line is commented in or out depending upon --enable-cgen-maint.
-@CGEN_MAINT@CGEN_MAINT =
-
 # BPF headers
 
 BPF_INCLUDE_DEPS = \
diff --git a/sim/bpf/configure.ac b/sim/bpf/configure.ac
index a4138c097a89..13516a0914e7 100644
--- a/sim/bpf/configure.ac
+++ b/sim/bpf/configure.ac
@@ -7,6 +7,5 @@ SIM_AC_COMMON
 SIM_AC_OPTION_BITSIZE([64])
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL([bpf-def])
-SIM_AC_OPTION_CGEN_MAINT
 
 SIM_AC_OUTPUT
diff --git a/sim/configure.ac b/sim/configure.ac
index a3f02a78e9a7..9530268ddc59 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -118,6 +118,7 @@ dnl Standard (and optional) simulator options.
 dnl Eventually all simulators will support these.
 SIM_AC_OPTION_ALIGNMENT
 SIM_AC_OPTION_ASSERT
+SIM_AC_OPTION_CGEN_MAINT
 SIM_AC_OPTION_DEBUG
 SIM_AC_OPTION_ENDIAN
 SIM_AC_OPTION_ENVIRONMENT
diff --git a/sim/cris/Makefile.in b/sim/cris/Makefile.in
index 0b4b8f5c530b..ef83ce818260 100644
--- a/sim/cris/Makefile.in
+++ b/sim/cris/Makefile.in
@@ -102,11 +102,6 @@ cris-clean:
 	-rm -f stamp-arch
 	-rm -f tmp-*
 
-# cgen support, enable with --enable-cgen-maint
-CGEN_MAINT = ; @true
-# The following line is commented in or out depending upon --enable-cgen-maint.
-@CGEN_MAINT@CGEN_MAINT =
-
 # Useful when making CGEN-generated files manually, without --enable-cgen-maint.
 stamps: stamp-v10fmloop stamp-v32fmloop stamp-arch stamp-v10fcpu stamp-v32fcpu
 
diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac
index d94eabb683a9..909c41653f18 100644
--- a/sim/cris/configure.ac
+++ b/sim/cris/configure.ac
@@ -9,6 +9,5 @@ SIM_AC_OPTION_HARDWARE(rv cris cris_900000xx)
 
 # The default model shouldn't matter as long as there's a BFD.
 SIM_AC_OPTION_DEFAULT_MODEL(crisv32)
-SIM_AC_OPTION_CGEN_MAINT
 
 SIM_AC_OUTPUT
diff --git a/sim/frv/Makefile.in b/sim/frv/Makefile.in
index 5356add6f0ac..6fdd6e0f1be3 100644
--- a/sim/frv/Makefile.in
+++ b/sim/frv/Makefile.in
@@ -69,11 +69,6 @@ frv-clean:
 	rm -f tmp-*
 	rm -f stamp-arch stamp-cpu
 
-# cgen support, enable with --enable-cgen-maint
-CGEN_MAINT = ; @true
-# The following line is commented in or out depending upon --enable-cgen-maint.
-@CGEN_MAINT@CGEN_MAINT =
-
 stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(srcdir)/../../cpu/frv.cpu
 	$(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all \
 	  archfile=$(srcdir)/../../cpu/frv.cpu \
diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac
index f652e269a3b8..a03b4f666426 100644
--- a/sim/frv/configure.ac
+++ b/sim/frv/configure.ac
@@ -6,7 +6,6 @@ SIM_AC_COMMON
 
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(fr500)
-SIM_AC_OPTION_CGEN_MAINT
 
 #
 # Enable making unknown traps dump out registers
diff --git a/sim/iq2000/Makefile.in b/sim/iq2000/Makefile.in
index f7a77c2eefd0..557db484b629 100644
--- a/sim/iq2000/Makefile.in
+++ b/sim/iq2000/Makefile.in
@@ -69,11 +69,6 @@ iq2000-clean:
 	rm -f tmp-*
 	rm -f stamp-arch stamp-cpu
 
-# cgen support, enable with --enable-cgen-maint
-CGEN_MAINT = ; @true
-# The following line is commented in or out depending upon --enable-cgen-maint.
-@CGEN_MAINT@CGEN_MAINT =
-
 stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CPU_DIR)/iq2000.cpu Makefile
 	$(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=iq2000 \
 	  archfile=$(CPU_DIR)/iq2000.cpu \
diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac
index 92c10d2eb183..c43463394a43 100644
--- a/sim/iq2000/configure.ac
+++ b/sim/iq2000/configure.ac
@@ -6,6 +6,5 @@ SIM_AC_COMMON
 
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(iq2000)
-SIM_AC_OPTION_CGEN_MAINT
 
 SIM_AC_OUTPUT
diff --git a/sim/lm32/Makefile.in b/sim/lm32/Makefile.in
index 29489bcf7e43..268882745c7e 100644
--- a/sim/lm32/Makefile.in
+++ b/sim/lm32/Makefile.in
@@ -48,11 +48,6 @@ lm32-clean:
 	rm -f stamp-arch stamp-cpu 
 	rm -f tmp-*
 
-# cgen support, enable with --enable-cgen-maint
-CGEN_MAINT = ; @true
-# The following line is commented in or out depending upon --enable-cgen-maint.
-@CGEN_MAINT@CGEN_MAINT =
-
 stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(CPU_DIR)/lm32.cpu
 	$(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all \
 	  archfile=$(CPU_DIR)/lm32.cpu \
diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac
index 32bbd1b4ac1c..b277c963a87f 100644
--- a/sim/lm32/configure.ac
+++ b/sim/lm32/configure.ac
@@ -6,7 +6,6 @@ SIM_AC_COMMON
 
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(lm32)
-SIM_AC_OPTION_CGEN_MAINT
 SIM_AC_OPTION_HARDWARE(lm32cpu lm32timer lm32uart)
 
 SIM_AC_OUTPUT
diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index 272974572ecf..f8ccb97d77b0 100644
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -108,11 +108,6 @@ m32r-clean:
 	rm -f stamp-arch stamp-cpu stamp-xcpu stamp-2cpu
 	rm -f tmp-*
 
-# cgen support, enable with --enable-cgen-maint
-CGEN_MAINT = ; @true
-# The following line is commented in or out depending upon --enable-cgen-maint.
-@CGEN_MAINT@CGEN_MAINT =
-
 # NOTE: Generated source files are specified as full paths,
 # e.g. $(srcdir)/arch.c, because make may decide the files live
 # in objdir otherwise.
diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index 3146feee6408..2e6b415e4065 100644
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -6,7 +6,6 @@ SIM_AC_COMMON
 
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)
-SIM_AC_OPTION_CGEN_MAINT
 
   case "${target_alias}" in
   m32r*-linux*)
diff --git a/sim/or1k/Makefile.in b/sim/or1k/Makefile.in
index c6083b0cd6ea..499b3508cef0 100644
--- a/sim/or1k/Makefile.in
+++ b/sim/or1k/Makefile.in
@@ -93,11 +93,6 @@ traps.o: traps.c $(SIM_MAIN_DEPS) eng.h
 or1k-clean:
 	rm -f mloop.c eng.h stamp-mloop
 
-# cgen support, enable with --enable-cgen-maint
-CGEN_MAINT = ; @true
-# The following line is commented in or out depending upon --enable-cgen-maint.
-@CGEN_MAINT@CGEN_MAINT =
-
 stamps: stamp-arch stamp-cpu stamp-mloop
 
 # NOTE: Generated source files are specified as full paths,
diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac
index 576574c2ded2..f77a7339d56a 100644
--- a/sim/or1k/configure.ac
+++ b/sim/or1k/configure.ac
@@ -7,6 +7,5 @@ SIM_AC_COMMON
 SIM_AC_OPTION_BITSIZE([32], [31], [32])
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL([or1200])
-SIM_AC_OPTION_CGEN_MAINT
 
 SIM_AC_OUTPUT
-- 
2.31.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 4/5] sim: unify general maintainer settings
  2021-06-19 20:27 [PATCH 1/5] sim: ppc: rename inline defines to match common code Mike Frysinger
  2021-06-19 20:27 ` [PATCH 2/5] sim: move sim-inline to the " Mike Frysinger
  2021-06-19 20:27 ` [PATCH 3/5] sim: unify cgen maintainer settings Mike Frysinger
@ 2021-06-19 20:27 ` Mike Frysinger
  2021-06-19 20:27 ` [PATCH 5/5] sim: delete SIM_AC_COMMON macro Mike Frysinger
  3 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2021-06-19 20:27 UTC (permalink / raw)
  To: gdb-patches

Move these options up to the common dir so we only test & export
them once across all ports.  This takes a page from the cgen maint
logic to make $(MAINT) work for non-automake Makefiles which will
allow us to merge it together.
---
 sim/aarch64/aclocal.m4         | 87 ----------------------------------
 sim/aarch64/configure          | 37 ---------------
 sim/arch-subdir.mk.in          |  7 +++
 sim/arm/aclocal.m4             | 87 ----------------------------------
 sim/arm/configure              | 37 ---------------
 sim/avr/aclocal.m4             | 87 ----------------------------------
 sim/avr/configure              | 37 ---------------
 sim/bfin/Makefile.in           |  2 +-
 sim/bfin/aclocal.m4            | 87 ----------------------------------
 sim/bfin/configure             | 37 ---------------
 sim/bpf/aclocal.m4             | 87 ----------------------------------
 sim/bpf/configure              | 37 ---------------
 sim/cr16/aclocal.m4            | 87 ----------------------------------
 sim/cr16/configure             | 37 ---------------
 sim/cris/aclocal.m4            | 87 ----------------------------------
 sim/cris/configure             | 37 ---------------
 sim/d10v/aclocal.m4            | 87 ----------------------------------
 sim/d10v/configure             | 37 ---------------
 sim/erc32/aclocal.m4           | 87 ----------------------------------
 sim/erc32/configure            | 37 ---------------
 sim/example-synacor/aclocal.m4 | 87 ----------------------------------
 sim/example-synacor/configure  | 37 ---------------
 sim/frv/aclocal.m4             | 87 ----------------------------------
 sim/frv/configure              | 37 ---------------
 sim/ft32/aclocal.m4            | 87 ----------------------------------
 sim/ft32/configure             | 37 ---------------
 sim/h8300/aclocal.m4           | 87 ----------------------------------
 sim/h8300/configure            | 37 ---------------
 sim/iq2000/aclocal.m4          | 87 ----------------------------------
 sim/iq2000/configure           | 37 ---------------
 sim/lm32/aclocal.m4            | 87 ----------------------------------
 sim/lm32/configure             | 37 ---------------
 sim/m32c/aclocal.m4            | 87 ----------------------------------
 sim/m32c/configure             | 37 ---------------
 sim/m32r/aclocal.m4            | 87 ----------------------------------
 sim/m32r/configure             | 37 ---------------
 sim/m4/sim_ac_common.m4        |  3 --
 sim/m68hc11/aclocal.m4         | 87 ----------------------------------
 sim/m68hc11/configure          | 37 ---------------
 sim/mcore/aclocal.m4           | 87 ----------------------------------
 sim/mcore/configure            | 37 ---------------
 sim/microblaze/aclocal.m4      | 87 ----------------------------------
 sim/microblaze/configure       | 37 ---------------
 sim/mips/aclocal.m4            | 87 ----------------------------------
 sim/mips/configure             | 37 ---------------
 sim/mn10300/aclocal.m4         | 87 ----------------------------------
 sim/mn10300/configure          | 37 ---------------
 sim/moxie/Makefile.in          |  2 +-
 sim/moxie/aclocal.m4           | 87 ----------------------------------
 sim/moxie/configure            | 37 ---------------
 sim/msp430/aclocal.m4          | 87 ----------------------------------
 sim/msp430/configure           | 37 ---------------
 sim/or1k/aclocal.m4            | 87 ----------------------------------
 sim/or1k/configure             | 37 ---------------
 sim/pru/aclocal.m4             | 87 ----------------------------------
 sim/pru/configure              | 37 ---------------
 sim/riscv/aclocal.m4           | 87 ----------------------------------
 sim/riscv/configure            | 37 ---------------
 sim/rl78/aclocal.m4            | 87 ----------------------------------
 sim/rl78/configure             | 37 ---------------
 sim/rx/aclocal.m4              | 87 ----------------------------------
 sim/rx/configure               | 37 ---------------
 sim/sh/aclocal.m4              | 87 ----------------------------------
 sim/sh/configure               | 37 ---------------
 sim/v850/aclocal.m4            | 87 ----------------------------------
 sim/v850/configure             | 37 ---------------
 66 files changed, 9 insertions(+), 3849 deletions(-)

diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in
index 6922b9719f39..dc8ccadec62c 100644
--- a/sim/arch-subdir.mk.in
+++ b/sim/arch-subdir.mk.in
@@ -53,6 +53,13 @@ COMMON_LIBS = @LIBS@
 WARN_CFLAGS = @WARN_CFLAGS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
 
+# Maintainer support, enable with --enable-maintainer-mode.
+# Once all subdirs are moved to automake, we can drop this custom logic and
+# switch back to using @MAINTAINER_MODE_TRUE@ directly.
+MAINT = ; @true
+# The following line is commented depending upon --enable-maintainer-mode.
+@MAINTAINER_MODE_TRUE@MAINT =
+
 # cgen support, enable with --enable-cgen-maint
 CGEN_MAINT = ; @true
 # The following line is commented in or out depending upon --enable-cgen-maint.
diff --git a/sim/bfin/Makefile.in b/sim/bfin/Makefile.in
index c53acd11030a..e3536158a2ad 100644
--- a/sim/bfin/Makefile.in
+++ b/sim/bfin/Makefile.in
@@ -31,7 +31,7 @@ SIM_EXTRA_LIBS = @SDL_LIBS@ -lm
 
 ## COMMON_POST_CONFIG_FRAG
 
-$(srcdir)/linux-fixed-code.h: @MAINTAINER_MODE_TRUE@ $(srcdir)/linux-fixed-code.s Makefile.in
+$(srcdir)/linux-fixed-code.h: $(MAINT) $(srcdir)/linux-fixed-code.s Makefile.in
 	$(AS_FOR_TARGET) $(srcdir)/linux-fixed-code.s -o linux-fixed-code.o
 	(	set -e; \
 		echo "/* DO NOT EDIT: Autogenerated from linux-fixed-code.s.  */"; \
diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
index 658789581471..e15ec02edf9f 100644
--- a/sim/m4/sim_ac_common.m4
+++ b/sim/m4/sim_ac_common.m4
@@ -21,7 +21,4 @@ dnl
 dnl See README-HACKING for more details.
 AC_DEFUN([SIM_AC_COMMON],
 [dnl
-dnl We don't use automake, but we still want to support
-dnl --enable-maintainer-mode.
-AM_MAINTAINER_MODE
 ]) dnl End of SIM_AC_COMMON
diff --git a/sim/moxie/Makefile.in b/sim/moxie/Makefile.in
index bd58074491fc..fa4238572d43 100644
--- a/sim/moxie/Makefile.in
+++ b/sim/moxie/Makefile.in
@@ -34,7 +34,7 @@ SIM_EXTRA_CFLAGS = -DDTB="\"$(dtbdir)/moxie-gdb.dtb\""
 
 all: moxie-gdb.dtb
 
-moxie-gdb.dtb: @MAINTAINER_MODE_TRUE@ moxie-gdb.dts
+moxie-gdb.dtb: $(MAINT) moxie-gdb.dts
 	@echo Regenerating moxie-gdb.dtb
 	if test "x$(DTC)" != x; then \
 	  $(DTC) -O dtb -o moxie-gdb.dtb ${srcdir}/moxie-gdb.dts || exit 1; \
-- 
2.31.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 5/5] sim: delete SIM_AC_COMMON macro
  2021-06-19 20:27 [PATCH 1/5] sim: ppc: rename inline defines to match common code Mike Frysinger
                   ` (2 preceding siblings ...)
  2021-06-19 20:27 ` [PATCH 4/5] sim: unify general " Mike Frysinger
@ 2021-06-19 20:27 ` Mike Frysinger
  3 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2021-06-19 20:27 UTC (permalink / raw)
  To: gdb-patches

Now that we've moved all content out to the common file, this is
empty and can be deleted it entirely.
---
 sim/README-HACKING               |  9 ---------
 sim/aarch64/aclocal.m4           |  1 -
 sim/aarch64/configure            |  2 --
 sim/aarch64/configure.ac         |  2 --
 sim/arm/aclocal.m4               |  1 -
 sim/arm/configure                |  2 --
 sim/arm/configure.ac             |  2 --
 sim/avr/aclocal.m4               |  1 -
 sim/avr/configure                |  2 --
 sim/avr/configure.ac             |  2 --
 sim/bfin/aclocal.m4              |  1 -
 sim/bfin/configure               |  2 --
 sim/bfin/configure.ac            |  2 --
 sim/bpf/aclocal.m4               |  1 -
 sim/bpf/configure                |  2 --
 sim/bpf/configure.ac             |  2 --
 sim/cr16/aclocal.m4              |  1 -
 sim/cr16/configure               |  2 --
 sim/cr16/configure.ac            |  2 --
 sim/cris/aclocal.m4              |  1 -
 sim/cris/configure               |  2 --
 sim/cris/configure.ac            |  2 --
 sim/d10v/aclocal.m4              |  1 -
 sim/d10v/configure               |  2 --
 sim/d10v/configure.ac            |  2 --
 sim/erc32/aclocal.m4             |  1 -
 sim/erc32/configure              |  2 --
 sim/erc32/configure.ac           |  2 --
 sim/example-synacor/aclocal.m4   |  1 -
 sim/example-synacor/configure    |  2 --
 sim/example-synacor/configure.ac |  2 --
 sim/frv/aclocal.m4               |  1 -
 sim/frv/configure                |  2 --
 sim/frv/configure.ac             |  2 --
 sim/ft32/aclocal.m4              |  1 -
 sim/ft32/configure               |  2 --
 sim/ft32/configure.ac            |  2 --
 sim/h8300/aclocal.m4             |  1 -
 sim/h8300/configure              |  2 --
 sim/h8300/configure.ac           |  2 --
 sim/iq2000/aclocal.m4            |  1 -
 sim/iq2000/configure             |  2 --
 sim/iq2000/configure.ac          |  2 --
 sim/lm32/aclocal.m4              |  1 -
 sim/lm32/configure               |  2 --
 sim/lm32/configure.ac            |  2 --
 sim/m32c/aclocal.m4              |  1 -
 sim/m32c/configure               |  2 --
 sim/m32c/configure.ac            |  2 --
 sim/m32r/aclocal.m4              |  1 -
 sim/m32r/configure               |  2 --
 sim/m32r/configure.ac            |  2 --
 sim/m4/sim_ac_common.m4          | 24 ------------------------
 sim/m68hc11/aclocal.m4           |  1 -
 sim/m68hc11/configure            |  2 --
 sim/m68hc11/configure.ac         |  2 --
 sim/mcore/aclocal.m4             |  1 -
 sim/mcore/configure              |  2 --
 sim/mcore/configure.ac           |  2 --
 sim/microblaze/aclocal.m4        |  1 -
 sim/microblaze/configure         |  2 --
 sim/microblaze/configure.ac      |  2 --
 sim/mips/aclocal.m4              |  1 -
 sim/mips/configure               |  2 --
 sim/mips/configure.ac            |  2 --
 sim/mn10300/aclocal.m4           |  1 -
 sim/mn10300/configure            |  2 --
 sim/mn10300/configure.ac         |  2 --
 sim/moxie/aclocal.m4             |  1 -
 sim/moxie/configure              |  2 --
 sim/moxie/configure.ac           |  2 --
 sim/msp430/aclocal.m4            |  1 -
 sim/msp430/configure             |  2 --
 sim/msp430/configure.ac          |  2 --
 sim/or1k/aclocal.m4              |  1 -
 sim/or1k/configure               |  2 --
 sim/or1k/configure.ac            |  2 --
 sim/pru/aclocal.m4               |  1 -
 sim/pru/configure                |  2 --
 sim/pru/configure.ac             |  2 --
 sim/riscv/aclocal.m4             |  1 -
 sim/riscv/configure              |  2 --
 sim/riscv/configure.ac           |  2 --
 sim/rl78/aclocal.m4              |  1 -
 sim/rl78/configure               |  2 --
 sim/rl78/configure.ac            |  2 --
 sim/rx/aclocal.m4                |  1 -
 sim/rx/configure                 |  2 --
 sim/rx/configure.ac              |  2 --
 sim/sh/aclocal.m4                |  1 -
 sim/sh/configure                 |  2 --
 sim/sh/configure.ac              |  2 --
 sim/v850/aclocal.m4              |  1 -
 sim/v850/configure               |  2 --
 sim/v850/configure.ac            |  2 --
 95 files changed, 188 deletions(-)
 delete mode 100644 sim/m4/sim_ac_common.m4

diff --git a/sim/README-HACKING b/sim/README-HACKING
index d4867c9e79e4..3715467337f7 100644
--- a/sim/README-HACKING
+++ b/sim/README-HACKING
@@ -41,20 +41,11 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../common ../.. ../../config])
 
-SIM_AC_COMMON
-
 ... target specific additions ...
 
 SIM_AC_OUTPUT
 --- snip ---
 
-SIM_AC_COMMON:
-
-- invokes the autoconf macros most often used by the simulators
-- defines --enable/--with options usable by all simulators
-- initializes sim_link_files/sim_link_links as the set of symbolic links
-  to set up
-
 SIM_AC_OUTPUT:
 
 - creates the symbolic links defined in sim_link_{files,links}
diff --git a/sim/aarch64/configure.ac b/sim/aarch64/configure.ac
index 849e957f8277..3d4290ac3f41 100644
--- a/sim/aarch64/configure.ac
+++ b/sim/aarch64/configure.ac
@@ -22,6 +22,4 @@ dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/arm/configure.ac b/sim/arm/configure.ac
index 08bf6ff8acbc..99370b3a5770 100644
--- a/sim/arm/configure.ac
+++ b/sim/arm/configure.ac
@@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/avr/configure.ac b/sim/avr/configure.ac
index 08bf6ff8acbc..99370b3a5770 100644
--- a/sim/avr/configure.ac
+++ b/sim/avr/configure.ac
@@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac
index 9b17dc4212fe..4e31c6f13594 100644
--- a/sim/bfin/configure.ac
+++ b/sim/bfin/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OPTION_DEFAULT_MODEL(bf537)
 SIM_AC_OPTION_HARDWARE(\
 	bfin_cec \
diff --git a/sim/bpf/configure.ac b/sim/bpf/configure.ac
index 13516a0914e7..32729370b5aa 100644
--- a/sim/bpf/configure.ac
+++ b/sim/bpf/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OPTION_BITSIZE([64])
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL([bpf-def])
diff --git a/sim/cr16/configure.ac b/sim/cr16/configure.ac
index 08bf6ff8acbc..99370b3a5770 100644
--- a/sim/cr16/configure.ac
+++ b/sim/cr16/configure.ac
@@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac
index 909c41653f18..13500a09a495 100644
--- a/sim/cris/configure.ac
+++ b/sim/cris/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_HARDWARE(rv cris cris_900000xx)
 
diff --git a/sim/d10v/configure.ac b/sim/d10v/configure.ac
index 08bf6ff8acbc..99370b3a5770 100644
--- a/sim/d10v/configure.ac
+++ b/sim/d10v/configure.ac
@@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index 3cb35d80f576..db6b98efa2e4 100644
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@@ -17,8 +17,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 # In the Cygwin environment, we need some additional flags.
 AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin,
 [AC_EGREP_CPP(lose, [
diff --git a/sim/example-synacor/configure.ac b/sim/example-synacor/configure.ac
index 08bf6ff8acbc..99370b3a5770 100644
--- a/sim/example-synacor/configure.ac
+++ b/sim/example-synacor/configure.ac
@@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac
index a03b4f666426..83ad0112844d 100644
--- a/sim/frv/configure.ac
+++ b/sim/frv/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(fr500)
 
diff --git a/sim/ft32/configure.ac b/sim/ft32/configure.ac
index 08bf6ff8acbc..99370b3a5770 100644
--- a/sim/ft32/configure.ac
+++ b/sim/ft32/configure.ac
@@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/h8300/configure.ac b/sim/h8300/configure.ac
index 08bf6ff8acbc..99370b3a5770 100644
--- a/sim/h8300/configure.ac
+++ b/sim/h8300/configure.ac
@@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac
index c43463394a43..e35068f31f8c 100644
--- a/sim/iq2000/configure.ac
+++ b/sim/iq2000/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(iq2000)
 
diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac
index b277c963a87f..edf7968b3e04 100644
--- a/sim/lm32/configure.ac
+++ b/sim/lm32/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(lm32)
 SIM_AC_OPTION_HARDWARE(lm32cpu lm32timer lm32uart)
diff --git a/sim/m32c/configure.ac b/sim/m32c/configure.ac
index 4f2c0ace70bb..7d86d83f8b20 100644
--- a/sim/m32c/configure.ac
+++ b/sim/m32c/configure.ac
@@ -21,6 +21,4 @@ dnl
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index 2e6b415e4065..a45eebdfedff 100644
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)
 
diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
deleted file mode 100644
index e15ec02edf9f..000000000000
--- a/sim/m4/sim_ac_common.m4
+++ /dev/null
@@ -1,24 +0,0 @@
-dnl   Copyright (C) 1997-2021 Free Software Foundation, Inc.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dnl
-dnl SIM_AC_COMMON invokes AC macros used by all simulators and by the common
-dnl directory.  It is intended to be invoked before any target specific stuff.
-dnl SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile.
-dnl It is intended to be invoked last.
-dnl
-dnl See README-HACKING for more details.
-AC_DEFUN([SIM_AC_COMMON],
-[dnl
-]) dnl End of SIM_AC_COMMON
diff --git a/sim/m68hc11/configure.ac b/sim/m68hc11/configure.ac
index 986d8addfd86..02eccf0ddcb7 100644
--- a/sim/m68hc11/configure.ac
+++ b/sim/m68hc11/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 dnl Options available in this module
 SIM_AC_OPTION_HARDWARE(\
   m68hc11 m68hc11sio m68hc11eepr m68hc11tim m68hc11spi nvram)
diff --git a/sim/mcore/configure.ac b/sim/mcore/configure.ac
index 08bf6ff8acbc..99370b3a5770 100644
--- a/sim/mcore/configure.ac
+++ b/sim/mcore/configure.ac
@@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/microblaze/configure.ac b/sim/microblaze/configure.ac
index 08bf6ff8acbc..99370b3a5770 100644
--- a/sim/microblaze/configure.ac
+++ b/sim/microblaze/configure.ac
@@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index d8ce2803aee6..a8c16b259251 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 dnl Options available in this module
 SIM_AC_OPTION_RESERVED_BITS(1)
 
diff --git a/sim/mn10300/configure.ac b/sim/mn10300/configure.ac
index 1083c062df68..e531be971cd7 100644
--- a/sim/mn10300/configure.ac
+++ b/sim/mn10300/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OPTION_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)
 SIM_AC_OPTION_HARDWARE(mn103cpu mn103int mn103tim mn103ser mn103iop)
diff --git a/sim/moxie/configure.ac b/sim/moxie/configure.ac
index c7475b799a6f..6631aac2ac5c 100644
--- a/sim/moxie/configure.ac
+++ b/sim/moxie/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 AC_CHECK_TOOL(DTC, dtc)
 
 SIM_AC_OUTPUT
diff --git a/sim/msp430/configure.ac b/sim/msp430/configure.ac
index 4f2c0ace70bb..7d86d83f8b20 100644
--- a/sim/msp430/configure.ac
+++ b/sim/msp430/configure.ac
@@ -21,6 +21,4 @@ dnl
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac
index f77a7339d56a..c72c80c5f47a 100644
--- a/sim/or1k/configure.ac
+++ b/sim/or1k/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OPTION_BITSIZE([32], [31], [32])
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL([or1200])
diff --git a/sim/pru/configure.ac b/sim/pru/configure.ac
index 8e9577c9ea25..ef9f47544a89 100644
--- a/sim/pru/configure.ac
+++ b/sim/pru/configure.ac
@@ -21,6 +21,4 @@ dnl
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/riscv/configure.ac b/sim/riscv/configure.ac
index e866c8f8f4a0..01afe511ca8e 100644
--- a/sim/riscv/configure.ac
+++ b/sim/riscv/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 # Select the default model for the target.
 riscv_model=
 case "${target}" in
diff --git a/sim/rl78/configure.ac b/sim/rl78/configure.ac
index 4f2c0ace70bb..7d86d83f8b20 100644
--- a/sim/rl78/configure.ac
+++ b/sim/rl78/configure.ac
@@ -21,6 +21,4 @@ dnl
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/rx/configure.ac b/sim/rx/configure.ac
index b4881f8488c6..78fc33bac37a 100644
--- a/sim/rx/configure.ac
+++ b/sim/rx/configure.ac
@@ -21,8 +21,6 @@ dnl
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 AC_ARG_ENABLE(cycle-accurate,
 [AS_HELP_STRING([--disable-cycle-accurate],
 		[Disable cycle accurate simulation (faster runtime)])],
diff --git a/sim/sh/configure.ac b/sim/sh/configure.ac
index 08bf6ff8acbc..99370b3a5770 100644
--- a/sim/sh/configure.ac
+++ b/sim/sh/configure.ac
@@ -2,6 +2,4 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OUTPUT
diff --git a/sim/v850/configure.ac b/sim/v850/configure.ac
index c3cd64627c0a..74eb1fa54685 100644
--- a/sim/v850/configure.ac
+++ b/sim/v850/configure.ac
@@ -2,8 +2,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(Makefile.in)
 AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
 
-SIM_AC_COMMON
-
 SIM_AC_OPTION_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)
 
-- 
2.31.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-06-19 20:27 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-19 20:27 [PATCH 1/5] sim: ppc: rename inline defines to match common code Mike Frysinger
2021-06-19 20:27 ` [PATCH 2/5] sim: move sim-inline to the " Mike Frysinger
2021-06-19 20:27 ` [PATCH 3/5] sim: unify cgen maintainer settings Mike Frysinger
2021-06-19 20:27 ` [PATCH 4/5] sim: unify general " Mike Frysinger
2021-06-19 20:27 ` [PATCH 5/5] sim: delete SIM_AC_COMMON macro Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).