mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-11 19:33:33 +08:00
105dd264de
At2974be626, frv-elf fails at the dv_sockser_install declaration in sim/frv/tconfig.in. But, with the trivial #include's added (see other sims tconfig.in, like cris or mn10300), it *still* fails building sim/frv/devices.c because of a missing UART_INCHAR_ADDR. I have no insight into what'd be a valid value, except that there's a definition in m32r, which was probably used as a template with frv not finished. Simulated hardware should not have been be enabled, and was indeed not enabled by default before94c63d78f(2013-03-23), where it seems to have been enabled for no simulator-specific reason. Except dv-sockser.o wasn't enabled even then: sim/frv/config.in wasn't regenerated, so HAVE_DV_SOCKSER was never defined. Maybe people were fooled by this in sim/frv/Makefile.in at that time (these two lines were later deleted, in73e76d20): CONFIG_DEVICES = dv-sockser.o CONFIG_DEVICES = (As it seems people have missed it before: the second line overrides the first...) I'm guessing these lines were part of the never-completed hardware-support. Commit73e76d20attempted to move the imagined dv-sockser.o from $(CONFIG_DEVICES) to $(frv_extra_objs) but missed that AC_SUBST would only affect @frv_extra_objs@ (not $(frv_extra_objs) per se) so nothing happened regarding sockser: dv-sockser.o was not compiled and HAVE_DV_SOCKSER was not defined. I'm removing the $(frv_extra_objs) too, to avoid confusion. The best action seems to be disabling all hardware support by default again until a specific sim maintainer finishes the work. Make check-sim for frv-elf shows no failures after this. sim/frv: * configure.ac: Default simulator hardware to off again. Remove dead frv_extra_objs substitution. * configure: Regenerate. * Makefile.in: Remove unused frv_extra_objs.
127 lines
4.2 KiB
Makefile
127 lines
4.2 KiB
Makefile
# Makefile template for Configure for the frv simulator
|
|
# Copyright (C) 1998-2014 Free Software Foundation, Inc.
|
|
# Contributed by Red Hat.
|
|
#
|
|
# 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/>.
|
|
|
|
## COMMON_PRE_CONFIG_FRAG
|
|
|
|
FRV_OBJS = frv.o cpu.o decode.o sem.o model.o mloop.o cgen-par.o
|
|
|
|
SIM_OBJS = \
|
|
$(SIM_NEW_COMMON_OBJS) \
|
|
sim-cpu.o \
|
|
sim-hload.o \
|
|
sim-hrw.o \
|
|
sim-model.o \
|
|
sim-reg.o \
|
|
cgen-utils.o cgen-trace.o cgen-scache.o cgen-fpu.o cgen-accfp.o \
|
|
cgen-run.o sim-reason.o sim-engine.o sim-stop.o \
|
|
sim-if.o arch.o \
|
|
$(FRV_OBJS) \
|
|
traps.o interrupts.o memory.o cache.o pipeline.o \
|
|
profile.o profile-fr400.o profile-fr450.o profile-fr500.o profile-fr550.o options.o \
|
|
devices.o reset.o registers.o
|
|
|
|
# Extra headers included by sim-main.h.
|
|
SIM_EXTRA_DEPS = \
|
|
$(CGEN_INCLUDE_DEPS) \
|
|
arch.h cpuall.h frv-sim.h $(srcdir)/../../opcodes/frv-desc.h cache.h \
|
|
registers.h profile.h \
|
|
$(sim-options_h)
|
|
|
|
SIM_EXTRA_CFLAGS = @sim_trapdump@
|
|
|
|
SIM_RUN_OBJS = nrun.o
|
|
SIM_EXTRA_CLEAN = frv-clean
|
|
|
|
# This selects the frv newlib/libgloss syscall definitions.
|
|
NL_TARGET = -DNL_TARGET_frv
|
|
|
|
## COMMON_POST_CONFIG_FRAG
|
|
|
|
arch = frv
|
|
|
|
arch.o: arch.c $(SIM_MAIN_DEPS)
|
|
|
|
devices.o: devices.c $(SIM_MAIN_DEPS)
|
|
|
|
# FRV objs
|
|
|
|
FRVBF_INCLUDE_DEPS = \
|
|
$(CGEN_MAIN_CPU_DEPS) \
|
|
$(SIM_EXTRA_DEPS) \
|
|
cpu.h decode.h eng.h
|
|
|
|
frv.o: frv.c $(FRVBF_INCLUDE_DEPS)
|
|
traps.o: traps.c $(FRVBF_INCLUDE_DEPS)
|
|
pipeline.o: pipeline.c $(FRVBF_INCLUDE_DEPS)
|
|
interrupts.o: interrupts.c $(FRVBF_INCLUDE_DEPS)
|
|
memory.o: memory.c $(FRVBF_INCLUDE_DEPS)
|
|
cache.o: cache.c $(FRVBF_INCLUDE_DEPS)
|
|
options.o: options.c $(FRVBF_INCLUDE_DEPS)
|
|
reset.o: reset.c $(FRVBF_INCLUDE_DEPS)
|
|
registers.o: registers.c $(FRVBF_INCLUDE_DEPS)
|
|
profile.o: profile.c profile-fr400.h profile-fr500.h profile-fr550.h $(FRVBF_INCLUDE_DEPS)
|
|
profile-fr400.o: profile-fr400.c profile-fr400.h $(FRVBF_INCLUDE_DEPS)
|
|
profile-fr450.o: profile-fr450.c $(FRVBF_INCLUDE_DEPS)
|
|
profile-fr500.o: profile-fr500.c profile-fr500.h $(FRVBF_INCLUDE_DEPS)
|
|
profile-fr550.o: profile-fr550.c profile-fr550.h $(FRVBF_INCLUDE_DEPS)
|
|
sim-if.o: sim-if.c $(FRVBF_INCLUDE_DEPS) $(srcdir)/../common/sim-core.h eng.h
|
|
|
|
|
|
# FIXME: Use of `mono' is wip.
|
|
mloop.c eng.h: stamp-mloop
|
|
stamp-mloop: $(srcdir)/../common/genmloop.sh mloop.in Makefile
|
|
$(SHELL) $(srccom)/genmloop.sh -shell $(SHELL) \
|
|
-mono -scache -parallel-generic-write -parallel-only \
|
|
-cpu frvbf -infile $(srcdir)/mloop.in
|
|
$(SHELL) $(srcroot)/move-if-change eng.hin eng.h
|
|
$(SHELL) $(srcroot)/move-if-change mloop.cin mloop.c
|
|
touch stamp-mloop
|
|
mloop.o: mloop.c $(FRVBF_INCLUDE_DEPS)
|
|
|
|
cpu.o: cpu.c $(FRVBF_INCLUDE_DEPS)
|
|
decode.o: decode.c $(FRVBF_INCLUDE_DEPS)
|
|
sem.o: sem.c $(FRVBF_INCLUDE_DEPS)
|
|
model.o: model.c $(FRVBF_INCLUDE_DEPS)
|
|
|
|
frv-clean:
|
|
rm -f mloop.c eng.h stamp-mloop
|
|
rm -f tmp-*
|
|
rm -f stamp-arch stamp-cpu
|
|
|
|
# cgen support, enable with --enable-cgen-maint
|
|
CGEN_MAINT = ; @true
|
|
# The following line is commented in or out depending upon --enable-cgen-maint.
|
|
@CGEN_MAINT@CGEN_MAINT =
|
|
|
|
stamp-arch: $(CGEN_READ_SCM) $(CGEN_ARCH_SCM) $(srcdir)/../../cpu/frv.cpu
|
|
$(MAKE) cgen-arch $(CGEN_FLAGS_TO_PASS) mach=all \
|
|
archfile=$(srcdir)/../../cpu/frv.cpu \
|
|
FLAGS="with-scache"
|
|
touch stamp-arch
|
|
arch.h arch.c cpuall.h: $(CGEN_MAINT) stamp-arch
|
|
# @true
|
|
|
|
stamp-cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(srcdir)/../../cpu/frv.cpu
|
|
$(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
|
|
cpu=frvbf mach=frv,fr550,fr500,fr450,fr400,tomcat,simple SUFFIX= \
|
|
archfile=$(srcdir)/../../cpu/frv.cpu \
|
|
FLAGS="with-scache with-profile=fn with-generic-write with-parallel-only" \
|
|
EXTRAFILES="$(CGEN_CPU_SEM)"
|
|
touch stamp-cpu
|
|
cpu.h sem.c model.c decode.c decode.h: $(CGEN_MAINT) stamp-cpu
|
|
# @true
|