From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id D5CCB3889801 for ; Sat, 19 Jun 2021 20:27:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D5CCB3889801 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 26050340988 for ; Sat, 19 Jun 2021 20:27:29 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 5/5] sim: delete SIM_AC_COMMON macro Date: Sat, 19 Jun 2021 16:27:21 -0400 Message-Id: <20210619202721.10432-5-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210619202721.10432-1-vapier@gentoo.org> References: <20210619202721.10432-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2021 20:27:32 -0000 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 . */ 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 . -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