From 6dd65fc048dbe167b809f687acc6228eb07ecec6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 6 Jun 2021 20:48:46 -0400 Subject: [PATCH] sim: unify bug & package settings 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(-) diff --git a/sim/ChangeLog b/sim/ChangeLog index b9616110e06..b8a2e6c1420 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,9 @@ +2021-06-12 Mike Frysinger + + * configure.ac: Define PKGVERSION & REPORT_BUGS_TO. + * m4/sim_ac_common.m4: Delete calls to ACX_PKGVERSION & ACX_BUGURL. + * aclocal.m4, config.h.in, configure, Makefile.in: Regenerate. + 2021-06-12 Mike Frysinger * configure.ac: Call SIM_AC_OPTION_DEBUG, SIM_AC_OPTION_STDIO, diff --git a/sim/Makefile.in b/sim/Makefile.in index 6df3d67d200..891253a5555 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -194,7 +194,8 @@ TESTS = testsuite/common/bits32m0$(EXEEXT) \ testsuite/common/alu-tst$(EXEEXT) subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ + $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/m4/sim_ac_option_assert.m4 \ @@ -647,8 +648,11 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKGVERSION = @PKGVERSION@ RANLIB = @RANLIB@ RANLIB_FOR_BUILD = @RANLIB_FOR_BUILD@ +REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@ +REPORT_BUGS_TO = @REPORT_BUGS_TO@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIM_PRIMARY_TARGET = @SIM_PRIMARY_TARGET@ diff --git a/sim/aarch64/aclocal.m4 b/sim/aarch64/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/aarch64/aclocal.m4 +++ b/sim/aarch64/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/aarch64/config.in b/sim/aarch64/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/aarch64/config.in +++ b/sim/aarch64/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/aarch64/configure b/sim/aarch64/configure index 4c47bdcfcf7..10454958d10 100755 --- a/sim/aarch64/configure +++ b/sim/aarch64/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="" diff --git a/sim/aclocal.m4 b/sim/aclocal.m4 index 3c639f0edfc..1dde78fcde5 100644 --- a/sim/aclocal.m4 +++ b/sim/aclocal.m4 @@ -1167,6 +1167,7 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([../config/acx.m4]) m4_include([../config/depstand.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/override.m4]) diff --git a/sim/arm/aclocal.m4 b/sim/arm/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/arm/aclocal.m4 +++ b/sim/arm/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/arm/config.in b/sim/arm/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/arm/config.in +++ b/sim/arm/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/arm/configure b/sim/arm/configure index 9ecbc24f8ad..f85ae472329 100755 --- a/sim/arm/configure +++ b/sim/arm/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="" diff --git a/sim/avr/aclocal.m4 b/sim/avr/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/avr/aclocal.m4 +++ b/sim/avr/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/avr/config.in b/sim/avr/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/avr/config.in +++ b/sim/avr/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/avr/configure b/sim/avr/configure index 9b16f2fb105..c7dbbaae5ad 100755 --- a/sim/avr/configure +++ b/sim/avr/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="LITTLE" diff --git a/sim/bfin/aclocal.m4 b/sim/bfin/aclocal.m4 index 24e0597672f..bf8ea926588 100644 --- a/sim/bfin/aclocal.m4 +++ b/sim/bfin/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/bfin/config.in b/sim/bfin/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/bfin/config.in +++ b/sim/bfin/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/bfin/configure b/sim/bfin/configure index 0b3ea4a73d0..c115c2ec3cd 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -641,9 +641,6 @@ SDL_CFLAGS PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -683,7 +680,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -777,8 +773,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_sim_default_model @@ -1451,8 +1445,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6913,17 +6905,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10787,7 +10768,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10790 "configure" +#line 10771 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10893,7 +10874,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10896 "configure" +#line 10877 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11189,62 +11170,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="LITTLE" diff --git a/sim/bpf/aclocal.m4 b/sim/bpf/aclocal.m4 index 50bdf77f1af..be3ce4306dd 100644 --- a/sim/bpf/aclocal.m4 +++ b/sim/bpf/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/bpf/config.in b/sim/bpf/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/bpf/config.in +++ b/sim/bpf/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/bpf/configure b/sim/bpf/configure index 87a79e1a7e4..0c69d9031fd 100755 --- a/sim/bpf/configure +++ b/sim/bpf/configure @@ -637,9 +637,6 @@ cgen_breaks cgen cgendir CGEN_MAINT -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -775,8 +771,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_bitsize enable_sim_endian enable_sim_alignment @@ -1451,8 +1445,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6906,17 +6898,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10780,7 +10761,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10783 "configure" +#line 10764 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10886,7 +10867,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10889 "configure" +#line 10870 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11182,62 +11163,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_word_bitsize="64" wire_word_msb="" diff --git a/sim/config.h.in b/sim/config.h.in index 8d7923e5348..65f9da0194f 100644 --- a/sim/config.h.in +++ b/sim/config.h.in @@ -394,9 +394,15 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Additional package description */ +#undef PKGVERSION + /* Sim profile settings */ #undef PROFILE +/* Bug reporting address */ +#undef REPORT_BUGS_TO + /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE diff --git a/sim/configure b/sim/configure index c9e4d6fcd41..2a9a9b62511 100755 --- a/sim/configure +++ b/sim/configure @@ -703,6 +703,9 @@ build_os build_vendor build_cpu build +REPORT_BUGS_TEXI +REPORT_BUGS_TO +PKGVERSION target_alias host_alias build_alias @@ -744,6 +747,8 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +with_pkgversion +with_bugurl enable_maintainer_mode enable_dependency_tracking enable_silent_rules @@ -1440,6 +1445,12 @@ Optional Features: input/output --enable-sim-trace=opts Enable tracing of simulated programs +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-pkgversion=PKG Use PKG in the version string in place of "SIM" + --with-bugurl=URL Direct users to URL to report a bug + Some influential environment variables: CC C compiler command CFLAGS C compiler flags @@ -2481,6 +2492,62 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +# Check whether --with-pkgversion was given. +if test "${with_pkgversion+set}" = set; then : + withval=$with_pkgversion; case "$withval" in + yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; + no) PKGVERSION= ;; + *) PKGVERSION="($withval) " ;; + esac +else + PKGVERSION="(SIM) " + +fi + + + + +cat >>confdefs.h <<_ACEOF +#define PKGVERSION "$PKGVERSION" +_ACEOF + + + +# Check whether --with-bugurl was given. +if test "${with_bugurl+set}" = set; then : + withval=$with_bugurl; case "$withval" in + yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; + no) BUGURL= + ;; + *) BUGURL="$withval" + ;; + esac +else + BUGURL="$PACKAGE_BUGREPORT" + +fi + + case ${BUGURL} in + "") + REPORT_BUGS_TO= + REPORT_BUGS_TEXI= + ;; + *) + REPORT_BUGS_TO="<$BUGURL>" + REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} + ;; + esac; + + + + +cat >>confdefs.h <<_ACEOF +#define REPORT_BUGS_TO "$REPORT_BUGS_TO" +_ACEOF + + ac_config_headers="$ac_config_headers config.h" diff --git a/sim/configure.ac b/sim/configure.ac index d8c6f2d4feb..8022a11bc91 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/cr16/aclocal.m4 b/sim/cr16/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/cr16/aclocal.m4 +++ b/sim/cr16/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/cr16/config.in b/sim/cr16/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/cr16/config.in +++ b/sim/cr16/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/cr16/configure b/sim/cr16/configure index 50b302e7e84..a5721fa6f00 100755 --- a/sim/cr16/configure +++ b/sim/cr16/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="LITTLE" diff --git a/sim/cris/aclocal.m4 b/sim/cris/aclocal.m4 index 1af7a84043e..948b36884ed 100644 --- a/sim/cris/aclocal.m4 +++ b/sim/cris/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/cris/config.in b/sim/cris/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/cris/config.in +++ b/sim/cris/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/cris/configure b/sim/cris/configure index fa8aed58efc..c65a228786c 100755 --- a/sim/cris/configure +++ b/sim/cris/configure @@ -638,9 +638,6 @@ cgen_breaks cgen cgendir CGEN_MAINT -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -680,7 +677,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -775,8 +771,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_sim_scache @@ -1449,8 +1443,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6904,17 +6896,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10778,7 +10759,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10762 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10865,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10868 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11180,62 +11161,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="LITTLE" diff --git a/sim/d10v/aclocal.m4 b/sim/d10v/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/d10v/aclocal.m4 +++ b/sim/d10v/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/d10v/config.in b/sim/d10v/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/d10v/config.in +++ b/sim/d10v/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/d10v/configure b/sim/d10v/configure index e605546d584..4e99517c5be 100755 --- a/sim/d10v/configure +++ b/sim/d10v/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="" diff --git a/sim/erc32/aclocal.m4 b/sim/erc32/aclocal.m4 index b568fae568c..f5eee940afc 100644 --- a/sim/erc32/aclocal.m4 +++ b/sim/erc32/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/erc32/config.in b/sim/erc32/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/erc32/config.in +++ b/sim/erc32/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/erc32/configure b/sim/erc32/configure index 23fc3dc1805..fe945ef5efe 100755 --- a/sim/erc32/configure +++ b/sim/erc32/configure @@ -642,9 +642,6 @@ cgen_breaks READLINE_CFLAGS READLINE TERMCAP -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -684,7 +681,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -775,8 +771,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_werror enable_build_warnings enable_sim_build_warnings @@ -1434,8 +1428,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6889,17 +6881,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10763,7 +10744,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10766 "configure" +#line 10747 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10869,7 +10850,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10872 "configure" +#line 10853 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11165,62 +11146,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - # Check whether --enable-werror was given. if test "${enable_werror+set}" = set; then : diff --git a/sim/example-synacor/aclocal.m4 b/sim/example-synacor/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/example-synacor/aclocal.m4 +++ b/sim/example-synacor/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/example-synacor/config.in b/sim/example-synacor/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/example-synacor/config.in +++ b/sim/example-synacor/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/example-synacor/configure b/sim/example-synacor/configure index 1cd1af911fa..55cf6655acc 100755 --- a/sim/example-synacor/configure +++ b/sim/example-synacor/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="LITTLE" diff --git a/sim/frv/aclocal.m4 b/sim/frv/aclocal.m4 index 1af7a84043e..948b36884ed 100644 --- a/sim/frv/aclocal.m4 +++ b/sim/frv/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/frv/config.in b/sim/frv/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/frv/config.in +++ b/sim/frv/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/frv/configure b/sim/frv/configure index d2f72d61628..bc3aa9cbeb5 100755 --- a/sim/frv/configure +++ b/sim/frv/configure @@ -639,9 +639,6 @@ sim_trapdump cgen cgendir CGEN_MAINT -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -681,7 +678,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -776,8 +772,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_sim_scache @@ -1452,8 +1446,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6907,17 +6899,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10781,7 +10762,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10784 "configure" +#line 10765 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10887,7 +10868,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10890 "configure" +#line 10871 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11183,62 +11164,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="BIG" diff --git a/sim/ft32/aclocal.m4 b/sim/ft32/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/ft32/aclocal.m4 +++ b/sim/ft32/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/ft32/config.in b/sim/ft32/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/ft32/config.in +++ b/sim/ft32/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/ft32/configure b/sim/ft32/configure index 0a5678cf41f..b56ec1a4e6e 100755 --- a/sim/ft32/configure +++ b/sim/ft32/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="LITTLE" diff --git a/sim/h8300/aclocal.m4 b/sim/h8300/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/h8300/aclocal.m4 +++ b/sim/h8300/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/h8300/config.in b/sim/h8300/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/h8300/config.in +++ b/sim/h8300/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/h8300/configure b/sim/h8300/configure index 9caaf0a1c35..d5e2c9c1a43 100755 --- a/sim/h8300/configure +++ b/sim/h8300/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="BIG" diff --git a/sim/iq2000/aclocal.m4 b/sim/iq2000/aclocal.m4 index 1af7a84043e..948b36884ed 100644 --- a/sim/iq2000/aclocal.m4 +++ b/sim/iq2000/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/iq2000/config.in b/sim/iq2000/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/iq2000/config.in +++ b/sim/iq2000/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/iq2000/configure b/sim/iq2000/configure index 5ac8ba9f2df..5a3b811f1d2 100755 --- a/sim/iq2000/configure +++ b/sim/iq2000/configure @@ -638,9 +638,6 @@ cgen_breaks cgen cgendir CGEN_MAINT -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -680,7 +677,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -775,8 +771,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_sim_scache @@ -1449,8 +1443,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6904,17 +6896,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10778,7 +10759,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10762 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10865,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10868 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11180,62 +11161,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="BIG" diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4 index 1af7a84043e..948b36884ed 100644 --- a/sim/lm32/aclocal.m4 +++ b/sim/lm32/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/lm32/config.in b/sim/lm32/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/lm32/config.in +++ b/sim/lm32/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/lm32/configure b/sim/lm32/configure index 3dbb140f1eb..9b732c9fd65 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -638,9 +638,6 @@ cgen_breaks cgen cgendir CGEN_MAINT -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -680,7 +677,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -775,8 +771,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_sim_scache @@ -1449,8 +1443,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6904,17 +6896,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10778,7 +10759,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10781 "configure" +#line 10762 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10884,7 +10865,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10887 "configure" +#line 10868 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11180,62 +11161,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="BIG" diff --git a/sim/m32c/aclocal.m4 b/sim/m32c/aclocal.m4 index b568fae568c..f5eee940afc 100644 --- a/sim/m32c/aclocal.m4 +++ b/sim/m32c/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/m32c/config.in b/sim/m32c/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/m32c/config.in +++ b/sim/m32c/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/m32c/configure b/sim/m32c/configure index d153041e8b9..15a737b061e 100755 --- a/sim/m32c/configure +++ b/sim/m32c/configure @@ -639,9 +639,6 @@ sim_endian sim_bitsize sim_alignment cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -681,7 +678,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_werror enable_build_warnings enable_sim_build_warnings @@ -1431,8 +1425,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6886,17 +6878,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10760,7 +10741,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10763 "configure" +#line 10744 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10866,7 +10847,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10869 "configure" +#line 10850 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11162,62 +11143,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - # Check whether --enable-werror was given. diff --git a/sim/m32r/aclocal.m4 b/sim/m32r/aclocal.m4 index 1af7a84043e..948b36884ed 100644 --- a/sim/m32r/aclocal.m4 +++ b/sim/m32r/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/m32r/config.in b/sim/m32r/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/m32r/config.in +++ b/sim/m32r/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/m32r/configure b/sim/m32r/configure index 25ee335704a..3dc94f6d72b 100755 --- a/sim/m32r/configure +++ b/sim/m32r/configure @@ -640,9 +640,6 @@ traps_obj cgen cgendir CGEN_MAINT -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -682,7 +679,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -777,8 +773,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_sim_scache @@ -1451,8 +1445,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6906,17 +6898,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10780,7 +10761,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10783 "configure" +#line 10764 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10886,7 +10867,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10889 "configure" +#line 10870 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11182,62 +11163,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="BIG" diff --git a/sim/m4/sim_ac_common.m4 b/sim/m4/sim_ac_common.m4 index 0f687dc7bc5..e8385c2e7c1 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/m68hc11/aclocal.m4 b/sim/m68hc11/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/m68hc11/aclocal.m4 +++ b/sim/m68hc11/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/m68hc11/config.in b/sim/m68hc11/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/m68hc11/config.in +++ b/sim/m68hc11/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure index 7be0e7e985b..999dc489dcf 100755 --- a/sim/m68hc11/configure +++ b/sim/m68hc11/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_sim_hardware @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="BIG" diff --git a/sim/mcore/aclocal.m4 b/sim/mcore/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/mcore/aclocal.m4 +++ b/sim/mcore/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/mcore/config.in b/sim/mcore/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/mcore/config.in +++ b/sim/mcore/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/mcore/configure b/sim/mcore/configure index e605546d584..4e99517c5be 100755 --- a/sim/mcore/configure +++ b/sim/mcore/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="" diff --git a/sim/microblaze/aclocal.m4 b/sim/microblaze/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/microblaze/aclocal.m4 +++ b/sim/microblaze/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/microblaze/config.in b/sim/microblaze/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/microblaze/config.in +++ b/sim/microblaze/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/microblaze/configure b/sim/microblaze/configure index 9ecbc24f8ad..f85ae472329 100755 --- a/sim/microblaze/configure +++ b/sim/microblaze/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="" diff --git a/sim/mips/aclocal.m4 b/sim/mips/aclocal.m4 index 61707d892ac..203d14cc8d2 100644 --- a/sim/mips/aclocal.m4 +++ b/sim/mips/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/mips/config.in b/sim/mips/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/mips/config.in +++ b/sim/mips/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/mips/configure b/sim/mips/configure index f3c03ddd015..42ee0f807db 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -645,9 +645,6 @@ sim_micromips_flags sim_m16_flags sim_igen_flags SIM_SUBTARGET -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -687,7 +684,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -783,8 +779,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_alignment enable_werror enable_build_warnings @@ -1464,8 +1458,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug --with-x use the X Window System Some influential environment variables: @@ -6921,17 +6913,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10795,7 +10776,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10798 "configure" +#line 10779 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10901,7 +10882,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10904 "configure" +#line 10885 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11197,62 +11178,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_alignment="NONSTRICT_ALIGNMENT" default_alignment="" diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4 index 7db520cdf2e..9c220ef49f0 100644 --- a/sim/mn10300/aclocal.m4 +++ b/sim/mn10300/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/mn10300/config.in b/sim/mn10300/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/mn10300/config.in +++ b/sim/mn10300/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/mn10300/configure b/sim/mn10300/configure index 3d5c0a778b0..0ac10baeb37 100755 --- a/sim/mn10300/configure +++ b/sim/mn10300/configure @@ -635,9 +635,6 @@ sim_default_model sim_scache sim_float cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -677,7 +674,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1444,8 +1438,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6899,17 +6891,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10773,7 +10754,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10776 "configure" +#line 10757 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10879,7 +10860,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10882 "configure" +#line 10863 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11175,62 +11156,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="LITTLE" diff --git a/sim/moxie/aclocal.m4 b/sim/moxie/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/moxie/aclocal.m4 +++ b/sim/moxie/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/moxie/config.in b/sim/moxie/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/moxie/config.in +++ b/sim/moxie/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/moxie/configure b/sim/moxie/configure index 4b3567930b6..c24729b3826 100755 --- a/sim/moxie/configure +++ b/sim/moxie/configure @@ -638,9 +638,6 @@ sim_float sim_bitsize cgen_breaks DTC -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -680,7 +677,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -773,8 +769,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1439,8 +1433,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6894,17 +6886,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10768,7 +10749,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10771 "configure" +#line 10752 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10874,7 +10855,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10877 "configure" +#line 10858 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11170,62 +11151,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dtc", so it can be a program name with args. diff --git a/sim/msp430/aclocal.m4 b/sim/msp430/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/msp430/aclocal.m4 +++ b/sim/msp430/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/msp430/config.in b/sim/msp430/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/msp430/config.in +++ b/sim/msp430/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/msp430/configure b/sim/msp430/configure index 9b16f2fb105..c7dbbaae5ad 100755 --- a/sim/msp430/configure +++ b/sim/msp430/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="LITTLE" diff --git a/sim/or1k/aclocal.m4 b/sim/or1k/aclocal.m4 index 50bdf77f1af..be3ce4306dd 100644 --- a/sim/or1k/aclocal.m4 +++ b/sim/or1k/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/or1k/config.in b/sim/or1k/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/or1k/config.in +++ b/sim/or1k/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/or1k/configure b/sim/or1k/configure index 88a1b0c2d5e..5c1c37843e5 100755 --- a/sim/or1k/configure +++ b/sim/or1k/configure @@ -637,9 +637,6 @@ cgen_breaks cgen cgendir CGEN_MAINT -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -775,8 +771,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_sim_bitsize @@ -1451,8 +1445,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6906,17 +6898,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10780,7 +10761,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10783 "configure" +#line 10764 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10886,7 +10867,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10889 "configure" +#line 10870 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11182,62 +11163,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="BIG" diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 2a5b8cac2ac..3926430d403 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,3 +1,14 @@ +2021-06-12 Mike Frysinger + + * configure.ac: Delete calls to ACX_PKGVERSION & ACX_BUGURL. + * aclocal.m4, config.in, configure: Regenerate. + +2021-06-12 Mike Frysinger + + * configure.ac: Delete sim-stdio & sim-trace. + * debug.h: Define TRACE_* defines. + * config.in, configure: Regenerate. + 2021-06-12 Mike Frysinger * configure.ac: Delete AC_STRUCT_*, AC_TYPE_*, AC_CHECK_FUNCS, diff --git a/sim/ppc/aclocal.m4 b/sim/ppc/aclocal.m4 index 98ea2b390c8..16c4360600d 100644 --- a/sim/ppc/aclocal.m4 +++ b/sim/ppc/aclocal.m4 @@ -12,7 +12,6 @@ # PARTICULAR PURPOSE. m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) -m4_include([../../config/acx.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/plugins.m4]) m4_include([../../config/zlib.m4]) diff --git a/sim/ppc/config.in b/sim/ppc/config.in index 02e6d94e94e..7b75892909d 100644 --- a/sim/ppc/config.in +++ b/sim/ppc/config.in @@ -67,12 +67,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/ppc/configure b/sim/ppc/configure index 49990a47a1a..5f0f7790a36 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -675,9 +675,6 @@ build_os build_vendor build_cpu build -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION WERROR_CFLAGS EGREP GREP @@ -774,8 +771,6 @@ enable_sim_timebase enable_werror enable_sim_warnings enable_sim_xor_endian -with_pkgversion -with_bugurl with_system_zlib enable_plugins ' @@ -1439,8 +1434,6 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pkgversion=PKG Use PKG in the version string in place of "GDB" - --with-bugurl=URL Direct users to URL to report a bug --with-system-zlib use installed libz Some influential environment variables: @@ -4488,62 +4481,6 @@ else fi - - -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(GDB) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac index 9783dcf4073..56973455e0b 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 diff --git a/sim/pru/aclocal.m4 b/sim/pru/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/pru/aclocal.m4 +++ b/sim/pru/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/pru/config.in b/sim/pru/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/pru/config.in +++ b/sim/pru/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/pru/configure b/sim/pru/configure index 9b16f2fb105..c7dbbaae5ad 100755 --- a/sim/pru/configure +++ b/sim/pru/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="LITTLE" diff --git a/sim/riscv/aclocal.m4 b/sim/riscv/aclocal.m4 index 98b9d1773f9..2995da2f4cc 100644 --- a/sim/riscv/aclocal.m4 +++ b/sim/riscv/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/riscv/config.in b/sim/riscv/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/riscv/config.in +++ b/sim/riscv/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/riscv/configure b/sim/riscv/configure index 35e6edf4d10..dc3611eb455 100755 --- a/sim/riscv/configure +++ b/sim/riscv/configure @@ -635,9 +635,6 @@ sim_reserved_bits sim_scache sim_float cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -677,7 +674,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1443,8 +1437,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6898,17 +6890,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10772,7 +10753,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10775 "configure" +#line 10756 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10878,7 +10859,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10881 "configure" +#line 10862 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11174,62 +11155,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="LITTLE" diff --git a/sim/rl78/aclocal.m4 b/sim/rl78/aclocal.m4 index b568fae568c..f5eee940afc 100644 --- a/sim/rl78/aclocal.m4 +++ b/sim/rl78/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/rl78/config.in b/sim/rl78/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/rl78/config.in +++ b/sim/rl78/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/rl78/configure b/sim/rl78/configure index d153041e8b9..15a737b061e 100755 --- a/sim/rl78/configure +++ b/sim/rl78/configure @@ -639,9 +639,6 @@ sim_endian sim_bitsize sim_alignment cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -681,7 +678,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_werror enable_build_warnings enable_sim_build_warnings @@ -1431,8 +1425,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6886,17 +6878,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10760,7 +10741,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10763 "configure" +#line 10744 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10866,7 +10847,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10869 "configure" +#line 10850 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11162,62 +11143,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - # Check whether --enable-werror was given. diff --git a/sim/rx/aclocal.m4 b/sim/rx/aclocal.m4 index b568fae568c..f5eee940afc 100644 --- a/sim/rx/aclocal.m4 +++ b/sim/rx/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/rx/config.in b/sim/rx/config.in index af33a829767..583732fa026 100644 --- a/sim/rx/config.in +++ b/sim/rx/config.in @@ -62,9 +62,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -83,12 +80,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/rx/configure b/sim/rx/configure index 1c0248526b9..bbf75ae6139 100755 --- a/sim/rx/configure +++ b/sim/rx/configure @@ -639,9 +639,6 @@ sim_endian sim_bitsize sim_alignment cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -681,7 +678,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_cycle_accurate enable_cycle_stats enable_werror @@ -1436,8 +1430,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6891,17 +6883,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10765,7 +10746,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10768 "configure" +#line 10749 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10871,7 +10852,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10874 "configure" +#line 10855 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11167,62 +11148,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - # Check whether --enable-cycle-accurate was given. if test "${enable_cycle_accurate+set}" = set; then : diff --git a/sim/sh/aclocal.m4 b/sim/sh/aclocal.m4 index 0cdbae2da9d..6591f2c4d80 100644 --- a/sim/sh/aclocal.m4 +++ b/sim/sh/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/sh/config.in b/sim/sh/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/sh/config.in +++ b/sim/sh/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/sh/configure b/sim/sh/configure index 0b548f798e4..f66af79cfa5 100755 --- a/sim/sh/configure +++ b/sim/sh/configure @@ -637,9 +637,6 @@ sim_scache sim_float sim_bitsize cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -679,7 +676,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_werror @@ -1438,8 +1432,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6893,17 +6885,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10767,7 +10748,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10770 "configure" +#line 10751 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10873,7 +10854,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10876 "configure" +#line 10857 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11169,62 +11150,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="" diff --git a/sim/v850/aclocal.m4 b/sim/v850/aclocal.m4 index 7db520cdf2e..9c220ef49f0 100644 --- a/sim/v850/aclocal.m4 +++ b/sim/v850/aclocal.m4 @@ -98,7 +98,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -m4_include([../../config/acx.m4]) m4_include([../../config/depstand.m4]) m4_include([../../config/gettext-sister.m4]) m4_include([../../config/lead-dot.m4]) diff --git a/sim/v850/config.in b/sim/v850/config.in index 29d1fe2ab99..c3a5c27da56 100644 --- a/sim/v850/config.in +++ b/sim/v850/config.in @@ -56,9 +56,6 @@ */ #undef LT_OBJDIR -/* Name of this package. */ -#undef PACKAGE - /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT @@ -77,12 +74,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Additional package description */ -#undef PKGVERSION - -/* Bug reporting address */ -#undef REPORT_BUGS_TO - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff --git a/sim/v850/configure b/sim/v850/configure index e298dbd8d4f..5b27076a307 100755 --- a/sim/v850/configure +++ b/sim/v850/configure @@ -635,9 +635,6 @@ sim_default_model sim_scache sim_float cgen_breaks -REPORT_BUGS_TEXI -REPORT_BUGS_TO -PKGVERSION MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -677,7 +674,6 @@ USE_NLS CCDEPMODE DEPDIR am__leading_dot -PACKAGE C_DIALECT RANLIB AR @@ -772,8 +768,6 @@ with_gnu_ld enable_libtool_lock enable_maintainer_mode enable_sim_inline -with_pkgversion -with_bugurl enable_sim_endian enable_sim_alignment enable_sim_reserved_bits @@ -1444,8 +1438,6 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pkgversion=PKG Use PKG in the version string in place of "SIM" - --with-bugurl=URL Direct users to URL to report a bug Some influential environment variables: CC C compiler command @@ -6899,17 +6891,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_config_headers="$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 - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - - # Dependency checking. ac_config_commands="$ac_config_commands depdir" @@ -10773,7 +10754,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10776 "configure" +#line 10757 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10879,7 +10860,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10882 "configure" +#line 10863 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11175,62 +11156,6 @@ fi -# Check whether --with-pkgversion was given. -if test "${with_pkgversion+set}" = set; then : - withval=$with_pkgversion; case "$withval" in - yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;; - no) PKGVERSION= ;; - *) PKGVERSION="($withval) " ;; - esac -else - PKGVERSION="(SIM) " - -fi - - - - - -# Check whether --with-bugurl was given. -if test "${with_bugurl+set}" = set; then : - withval=$with_bugurl; case "$withval" in - yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;; - no) BUGURL= - ;; - *) BUGURL="$withval" - ;; - esac -else - BUGURL="https://www.gnu.org/software/gdb/bugs/" - -fi - - case ${BUGURL} in - "") - REPORT_BUGS_TO= - REPORT_BUGS_TEXI= - ;; - *) - REPORT_BUGS_TO="<$BUGURL>" - REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`} - ;; - esac; - - - - -cat >>confdefs.h <<_ACEOF -#define PKGVERSION "$PKGVERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define REPORT_BUGS_TO "$REPORT_BUGS_TO" -_ACEOF - - - - wire_endian="LITTLE" -- 2.30.2