mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-04-06 14:21:43 +08:00
sim: drop support for recursive makes entirely
Now that all ports have been merged to the top-level, we no longer need this framework to pass settings down to sub-makefiles. Delete it all.
This commit is contained in:
Mike Frysinger
parent
2c3bcf2537
commit
c67a81c92f
@ -365,7 +365,7 @@ CONFIG_CLEAN_FILES = aarch64/.gdbinit arm/.gdbinit avr/.gdbinit \
|
||||
mips/.gdbinit mn10300/.gdbinit moxie/.gdbinit msp430/.gdbinit \
|
||||
or1k/.gdbinit ppc/.gdbinit pru/.gdbinit riscv/.gdbinit \
|
||||
rl78/.gdbinit rx/.gdbinit sh/.gdbinit erc32/.gdbinit \
|
||||
v850/.gdbinit example-synacor/.gdbinit arch-subdir.mk .gdbinit
|
||||
v850/.gdbinit example-synacor/.gdbinit .gdbinit
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
LIBRARIES = $(noinst_LIBRARIES)
|
||||
ARFLAGS = cru
|
||||
@ -3341,8 +3341,6 @@ v850/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@
|
||||
example-synacor/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@
|
||||
arch-subdir.mk: $(top_builddir)/config.status $(srcdir)/arch-subdir.mk.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@
|
||||
.gdbinit: $(top_builddir)/config.status $(srcdir)/gdbinit.in
|
||||
cd $(top_builddir) && $(SHELL) ./config.status $@
|
||||
|
||||
|
||||
@ -1,68 +0,0 @@
|
||||
## Fragment to pass common settings into arch subdir builds.
|
||||
## NB: This should eventually be merged into sim/Makefile.am once there are no
|
||||
## subdir configure scripts.
|
||||
#
|
||||
# Copyright (C) 1993-2023 Free Software Foundation, Inc.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
AM_V = @AM_V@
|
||||
|
||||
EXEEXT = @EXEEXT@
|
||||
|
||||
LN_S = @LN_S@
|
||||
|
||||
CC = @CC@
|
||||
C_DIALECT = @C_DIALECT@
|
||||
CC_FOR_BUILD = @CC_FOR_BUILD@
|
||||
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
|
||||
CFLAGS = @CFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
AR = @AR@
|
||||
AR_FLAGS = rc
|
||||
RANLIB = @RANLIB@
|
||||
|
||||
LIBTOOL = @LIBTOOL@
|
||||
AM_V_lt = $(am__v_lt_@AM_V@)
|
||||
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
|
||||
am__v_lt_0 = --silent
|
||||
am__v_lt_1 =
|
||||
|
||||
DEPMODE = @CCDEPMODE@
|
||||
DEPDIR = @DEPDIR@
|
||||
|
||||
SDL_CFLAGS = @SDL_CFLAGS@
|
||||
TERMCAP_LIB = @TERMCAP_LIB@
|
||||
READLINE_LIB = @READLINE_LIB@
|
||||
READLINE_CFLAGS = @READLINE_CFLAGS@
|
||||
|
||||
COMMON_LIBS = @LIBS@
|
||||
WARN_CFLAGS = @WARN_CFLAGS@
|
||||
WERROR_CFLAGS = @WERROR_CFLAGS@
|
||||
|
||||
# Maintainer support, enable with --enable-maintainer-mode.
|
||||
# Once all subdirs are moved to automake, we can drop this custom logic and
|
||||
# switch back to using @MAINTAINER_MODE_TRUE@ directly.
|
||||
MAINT = ; @true
|
||||
# The following line is commented depending upon --enable-maintainer-mode.
|
||||
@MAINTAINER_MODE_TRUE@MAINT =
|
||||
|
||||
SIM_INLINE = @SIM_INLINE@
|
||||
|
||||
SIM_HW_CFLAGS = @SIM_HW_CFLAGS@
|
||||
|
||||
PPC_IGEN_FLAGS = $(ppc_IGEN_FLAGS)
|
||||
35
sim/configure
vendored
35
sim/configure
vendored
@ -14518,7 +14518,6 @@ if test "${enable_sim}" != no; then
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " aarch64"
|
||||
|
||||
ac_config_files="$ac_config_files aarch64/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -14682,7 +14681,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " arm"
|
||||
|
||||
ac_config_files="$ac_config_files arm/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -14719,7 +14717,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " avr"
|
||||
|
||||
ac_config_files="$ac_config_files avr/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -14756,7 +14753,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " bfin"
|
||||
|
||||
ac_config_files="$ac_config_files bfin/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -14793,7 +14789,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " bpf"
|
||||
|
||||
ac_config_files="$ac_config_files bpf/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -14830,7 +14825,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " cr16"
|
||||
|
||||
ac_config_files="$ac_config_files cr16/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -14867,7 +14861,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " cris"
|
||||
|
||||
ac_config_files="$ac_config_files cris/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -14904,7 +14897,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " d10v"
|
||||
|
||||
ac_config_files="$ac_config_files d10v/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -14941,7 +14933,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " frv"
|
||||
|
||||
ac_config_files="$ac_config_files frv/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -14978,7 +14969,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " ft32"
|
||||
|
||||
ac_config_files="$ac_config_files ft32/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15015,7 +15005,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " h8300"
|
||||
|
||||
ac_config_files="$ac_config_files h8300/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15052,7 +15041,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " iq2000"
|
||||
|
||||
ac_config_files="$ac_config_files iq2000/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15089,7 +15077,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " lm32"
|
||||
|
||||
ac_config_files="$ac_config_files lm32/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15126,7 +15113,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " m32c"
|
||||
|
||||
ac_config_files="$ac_config_files m32c/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15163,7 +15149,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " m32r"
|
||||
|
||||
ac_config_files="$ac_config_files m32r/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15200,7 +15185,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " m68hc11"
|
||||
|
||||
ac_config_files="$ac_config_files m68hc11/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15237,7 +15221,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " mcore"
|
||||
|
||||
ac_config_files="$ac_config_files mcore/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15274,7 +15257,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " microblaze"
|
||||
|
||||
ac_config_files="$ac_config_files microblaze/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15311,7 +15293,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " mips"
|
||||
|
||||
ac_config_files="$ac_config_files mips/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15348,7 +15329,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " mn10300"
|
||||
|
||||
ac_config_files="$ac_config_files mn10300/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15385,7 +15365,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " moxie"
|
||||
|
||||
ac_config_files="$ac_config_files moxie/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15422,7 +15401,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " msp430"
|
||||
|
||||
ac_config_files="$ac_config_files msp430/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15459,7 +15437,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " or1k"
|
||||
|
||||
ac_config_files="$ac_config_files or1k/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15496,7 +15473,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " ppc"
|
||||
|
||||
ac_config_files="$ac_config_files ppc/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15533,7 +15509,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " pru"
|
||||
|
||||
ac_config_files="$ac_config_files pru/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15570,7 +15545,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " riscv"
|
||||
|
||||
ac_config_files="$ac_config_files riscv/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15607,7 +15581,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " rl78"
|
||||
|
||||
ac_config_files="$ac_config_files rl78/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15644,7 +15617,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " rx"
|
||||
|
||||
ac_config_files="$ac_config_files rx/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15681,7 +15653,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " sh"
|
||||
|
||||
ac_config_files="$ac_config_files sh/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15718,7 +15689,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " erc32"
|
||||
|
||||
ac_config_files="$ac_config_files erc32/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15755,7 +15725,6 @@ fi
|
||||
fi
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " v850"
|
||||
|
||||
ac_config_files="$ac_config_files v850/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -15799,7 +15768,6 @@ as_fn_append SIM_TOOLCHAIN_VARS " AS_FOR_TARGET_EXAMPLE_SYNACOR LD_FOR_TARGET_EX
|
||||
|
||||
ENABLE_SIM=yes
|
||||
as_fn_append SIM_ENABLED_ARCHES " example-synacor"
|
||||
|
||||
ac_config_files="$ac_config_files example-synacor/.gdbinit:common/gdbinit.in"
|
||||
|
||||
|
||||
@ -17130,7 +17098,7 @@ fi
|
||||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files arch-subdir.mk Makefile .gdbinit:gdbinit.in"
|
||||
ac_config_files="$ac_config_files Makefile .gdbinit:gdbinit.in"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
@ -18306,7 +18274,6 @@ do
|
||||
"erc32/.gdbinit") CONFIG_FILES="$CONFIG_FILES erc32/.gdbinit:common/gdbinit.in" ;;
|
||||
"v850/.gdbinit") CONFIG_FILES="$CONFIG_FILES v850/.gdbinit:common/gdbinit.in" ;;
|
||||
"example-synacor/.gdbinit") CONFIG_FILES="$CONFIG_FILES example-synacor/.gdbinit:common/gdbinit.in" ;;
|
||||
"arch-subdir.mk") CONFIG_FILES="$CONFIG_FILES arch-subdir.mk" ;;
|
||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
".gdbinit") CONFIG_FILES="$CONFIG_FILES .gdbinit:gdbinit.in" ;;
|
||||
|
||||
|
||||
@ -58,19 +58,14 @@ AC_SUBST(SIM_ENABLED_ARCHES)
|
||||
ENABLE_SIM=no
|
||||
dnl Build a particular arch subdir.
|
||||
dnl arg[1] is the arch subdir name.
|
||||
dnl arg[2] is whether the arch has a dedicated configure script.
|
||||
m4_define([SIM_BUILD_TARGET], [dnl
|
||||
ENABLE_SIM=yes
|
||||
AS_VAR_APPEND([SIM_ENABLED_ARCHES], [" $1"])
|
||||
m4_if($2, [true], [dnl
|
||||
AC_CONFIG_FILES($1/Makefile)
|
||||
])
|
||||
AC_CONFIG_FILES($1/.gdbinit:common/gdbinit.in)
|
||||
])
|
||||
dnl Enable a particular arch subdir.
|
||||
dnl arg[1] is the matching target triple.
|
||||
dnl arg[2] is the arch subdir name.
|
||||
dnl arg[3] is whether the arch has a dedicated configure script.
|
||||
m4_define([SIM_TARGET], [dnl
|
||||
sim_enable_arch_$2=false
|
||||
case "${targ}" in
|
||||
@ -78,7 +73,7 @@ m4_define([SIM_TARGET], [dnl
|
||||
if test "${targ}" = "${target}"; then
|
||||
SIM_PRIMARY_TARGET=$2
|
||||
fi
|
||||
SIM_BUILD_TARGET($2, $3)
|
||||
SIM_BUILD_TARGET($2)
|
||||
sim_enable_arch_$2=true
|
||||
;;
|
||||
esac
|
||||
@ -162,5 +157,5 @@ m4_include([ppc/acinclude.m4])
|
||||
m4_include([riscv/acinclude.m4])
|
||||
m4_include([rx/acinclude.m4])
|
||||
|
||||
AC_CONFIG_FILES([arch-subdir.mk Makefile .gdbinit:gdbinit.in])
|
||||
AC_CONFIG_FILES([Makefile .gdbinit:gdbinit.in])
|
||||
AC_OUTPUT
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user