[6/7,v2] sim: unify bug & package settings

Message ID 20210613002549.15624-1-vapier@gentoo.org
State New
Headers show
Series
  • Untitled series #38890
Related show

Commit Message

Simon Marchi via Gdb-patches June 13, 2021, 12:25 a.m.
Move these options up to the common dir so we only test & export
them once across all ports.  The AC_INIT macro does a lot of the
heavy lifting already which allows further simplification.
---
 sim/ChangeLog                  |  6 +++
 sim/Makefile.in                |  6 ++-
 sim/aarch64/aclocal.m4         |  1 -
 sim/aarch64/config.in          |  9 ----
 sim/aarch64/configure          | 79 +---------------------------------
 sim/aclocal.m4                 |  1 +
 sim/arm/aclocal.m4             |  1 -
 sim/arm/config.in              |  9 ----
 sim/arm/configure              | 79 +---------------------------------
 sim/avr/aclocal.m4             |  1 -
 sim/avr/config.in              |  9 ----
 sim/avr/configure              | 79 +---------------------------------
 sim/bfin/aclocal.m4            |  1 -
 sim/bfin/config.in             |  9 ----
 sim/bfin/configure             | 79 +---------------------------------
 sim/bpf/aclocal.m4             |  1 -
 sim/bpf/config.in              |  9 ----
 sim/bpf/configure              | 79 +---------------------------------
 sim/config.h.in                |  6 +++
 sim/configure                  | 67 ++++++++++++++++++++++++++++
 sim/configure.ac               |  7 +++
 sim/cr16/aclocal.m4            |  1 -
 sim/cr16/config.in             |  9 ----
 sim/cr16/configure             | 79 +---------------------------------
 sim/cris/aclocal.m4            |  1 -
 sim/cris/config.in             |  9 ----
 sim/cris/configure             | 79 +---------------------------------
 sim/d10v/aclocal.m4            |  1 -
 sim/d10v/config.in             |  9 ----
 sim/d10v/configure             | 79 +---------------------------------
 sim/erc32/aclocal.m4           |  1 -
 sim/erc32/config.in            |  9 ----
 sim/erc32/configure            | 79 +---------------------------------
 sim/example-synacor/aclocal.m4 |  1 -
 sim/example-synacor/config.in  |  9 ----
 sim/example-synacor/configure  | 79 +---------------------------------
 sim/frv/aclocal.m4             |  1 -
 sim/frv/config.in              |  9 ----
 sim/frv/configure              | 79 +---------------------------------
 sim/ft32/aclocal.m4            |  1 -
 sim/ft32/config.in             |  9 ----
 sim/ft32/configure             | 79 +---------------------------------
 sim/h8300/aclocal.m4           |  1 -
 sim/h8300/config.in            |  9 ----
 sim/h8300/configure            | 79 +---------------------------------
 sim/iq2000/aclocal.m4          |  1 -
 sim/iq2000/config.in           |  9 ----
 sim/iq2000/configure           | 79 +---------------------------------
 sim/lm32/aclocal.m4            |  1 -
 sim/lm32/config.in             |  9 ----
 sim/lm32/configure             | 79 +---------------------------------
 sim/m32c/aclocal.m4            |  1 -
 sim/m32c/config.in             |  9 ----
 sim/m32c/configure             | 79 +---------------------------------
 sim/m32r/aclocal.m4            |  1 -
 sim/m32r/config.in             |  9 ----
 sim/m32r/configure             | 79 +---------------------------------
 sim/m4/sim_ac_common.m4        | 12 ------
 sim/m68hc11/aclocal.m4         |  1 -
 sim/m68hc11/config.in          |  9 ----
 sim/m68hc11/configure          | 79 +---------------------------------
 sim/mcore/aclocal.m4           |  1 -
 sim/mcore/config.in            |  9 ----
 sim/mcore/configure            | 79 +---------------------------------
 sim/microblaze/aclocal.m4      |  1 -
 sim/microblaze/config.in       |  9 ----
 sim/microblaze/configure       | 79 +---------------------------------
 sim/mips/aclocal.m4            |  1 -
 sim/mips/config.in             |  9 ----
 sim/mips/configure             | 79 +---------------------------------
 sim/mn10300/aclocal.m4         |  1 -
 sim/mn10300/config.in          |  9 ----
 sim/mn10300/configure          | 79 +---------------------------------
 sim/moxie/aclocal.m4           |  1 -
 sim/moxie/config.in            |  9 ----
 sim/moxie/configure            | 79 +---------------------------------
 sim/msp430/aclocal.m4          |  1 -
 sim/msp430/config.in           |  9 ----
 sim/msp430/configure           | 79 +---------------------------------
 sim/or1k/aclocal.m4            |  1 -
 sim/or1k/config.in             |  9 ----
 sim/or1k/configure             | 79 +---------------------------------
 sim/ppc/ChangeLog              | 11 +++++
 sim/ppc/aclocal.m4             |  1 -
 sim/ppc/config.in              |  6 ---
 sim/ppc/configure              | 63 ---------------------------
 sim/ppc/configure.ac           |  5 ---
 sim/pru/aclocal.m4             |  1 -
 sim/pru/config.in              |  9 ----
 sim/pru/configure              | 79 +---------------------------------
 sim/riscv/aclocal.m4           |  1 -
 sim/riscv/config.in            |  9 ----
 sim/riscv/configure            | 79 +---------------------------------
 sim/rl78/aclocal.m4            |  1 -
 sim/rl78/config.in             |  9 ----
 sim/rl78/configure             | 79 +---------------------------------
 sim/rx/aclocal.m4              |  1 -
 sim/rx/config.in               |  9 ----
 sim/rx/configure               | 79 +---------------------------------
 sim/sh/aclocal.m4              |  1 -
 sim/sh/config.in               |  9 ----
 sim/sh/configure               | 79 +---------------------------------
 sim/v850/aclocal.m4            |  1 -
 sim/v850/config.in             |  9 ----
 sim/v850/configure             | 79 +---------------------------------
 105 files changed, 165 insertions(+), 2785 deletions(-)

-- 
2.31.1

Patch

diff --git a/sim/configure.ac b/sim/configure.ac
index d8c6f2d4feb4..8022a11bc91a 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -5,6 +5,13 @@  AC_INIT([sim], [0],
   [https://sourceware.org/bugzilla/enter_bug.cgi?product=gdb&component=sim],
   [], [https://sourceware.org/gdb/wiki/Sim/])
 
+dnl Probably should unify PKGVERSION with PACKAGE_* settings from AC_INIT.
+ACX_PKGVERSION([SIM])
+AC_DEFINE_UNQUOTED([PKGVERSION], ["$PKGVERSION"], [Additional package description])
+dnl PACKAGE_BUGREPORT is provided by AC_INIT.
+ACX_BUGURL([$PACKAGE_BUGREPORT])
+AC_DEFINE_UNQUOTED([REPORT_BUGS_TO], ["$REPORT_BUGS_TO"], [Bug reporting address])
+
 AC_CONFIG_HEADERS([config.h])
 
 SIM_AC_TOOLCHAIN
diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4
index 0f687dc7bc58..e8385c2e7c1c 100644
--- a/sim/m4/sim_ac_common.m4
+++ b/sim/m4/sim_ac_common.m4
@@ -24,13 +24,6 @@  AC_DEFUN([SIM_AC_COMMON],
 SIM_AC_TOOLCHAIN
 AC_CONFIG_HEADERS([config.h:config.in])
 
-# Some of the common include files depend on bfd.h, and bfd.h checks
-# that config.h is included first by testing that the PACKAGE macro
-# is defined.
-PACKAGE=sim
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package. ])
-AC_SUBST(PACKAGE)
-
 # Dependency checking.
 ZW_CREATE_DEPDIR
 ZW_PROG_COMPILER_DEPENDENCIES([CC])
@@ -60,11 +53,6 @@  AM_MAINTAINER_MODE
 
 SIM_AC_OPTION_INLINE
 
-ACX_PKGVERSION([SIM])
-ACX_BUGURL([https://www.gnu.org/software/gdb/bugs/])
-AC_DEFINE_UNQUOTED([PKGVERSION], ["$PKGVERSION"], [Additional package description])
-AC_DEFINE_UNQUOTED([REPORT_BUGS_TO], ["$REPORT_BUGS_TO"], [Bug reporting address])
-
 dnl Detect exe extension
 AC_EXEEXT
 ]) dnl End of SIM_AC_COMMON
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 9783dcf40734..56973455e0be 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -592,11 +592,6 @@  if test x"$silent" != x"yes" && test x"$sim_xor_endian" != x""; then
 fi],[sim_xor_endian=""])dnl
 
 
-ACX_PKGVERSION([GDB])
-ACX_BUGURL([https://www.gnu.org/software/gdb/bugs/])
-AC_DEFINE_UNQUOTED([PKGVERSION], ["$PKGVERSION"], [Additional package description])
-AC_DEFINE_UNQUOTED([REPORT_BUGS_TO], ["$REPORT_BUGS_TO"], [Bug reporting address])
-
 AC_CANONICAL_SYSTEM
 AC_ARG_PROGRAM