sim: mips: clean up a bit after mips/configure removal

Now that there is no subdir configure script, we can clean up some
logic that was spread between the files.
This commit is contained in:
Mike Frysinger
2022-12-24 21:29:55 -05:00
parent abc494c65d
commit 23ddbd2f2b
5 changed files with 5 additions and 13 deletions

View File

@ -246,8 +246,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/m4/sim_ac_option_warnings.m4 \
$(top_srcdir)/m4/sim_ac_platform.m4 \
$(top_srcdir)/m4/sim_ac_toolchain.m4 \
$(top_srcdir)/frv/acinclude.m4 \
$(top_srcdir)/mips/acinclude-top.m4 \
$(top_srcdir)/frv/acinclude.m4 $(top_srcdir)/mips/acinclude.m4 \
$(top_srcdir)/riscv/acinclude.m4 $(top_srcdir)/rx/acinclude.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

View File

@ -73,8 +73,3 @@ SIM_INLINE = @SIM_INLINE@
SIM_HW_CFLAGS = @SIM_HW_CFLAGS@
SIM_HW_OBJS = $(SIM_HW_DEVICES:%=dv-%.o)
@SIM_ENABLE_HW_FALSE@SIM_HW_OBJS =
# This can be removed once mips/configure is gone.
SIM_MIPS_SUBTARGET = @SIM_MIPS_SUBTARGET@
SIM_MIPS_BITSIZE = -DWITH_TARGET_WORD_BITSIZE=@SIM_MIPS_BITSIZE@ -DWITH_TARGET_WORD_MSB=WITH_TARGET_WORD_BITSIZE-1
SIM_MIPS_FPU_BITSIZE = @SIM_MIPS_FPU_BITSIZE@

View File

@ -203,7 +203,7 @@ AC_SUBST(sim_float)
dnl Some arches have unique configure flags.
m4_include([frv/acinclude.m4])
m4_include([mips/acinclude-top.m4])
m4_include([mips/acinclude.m4])
m4_include([riscv/acinclude.m4])
m4_include([rx/acinclude.m4])

View File

@ -77,10 +77,10 @@ SIM_OBJS = \
sim-resume.o \
# List of flags to always pass to $(CC).
SIM_EXTRA_CFLAGS = $(SIM_MIPS_SUBTARGET)
SIM_EXTRA_CFLAGS = @SIM_MIPS_SUBTARGET@
SIM_BITSIZE = $(SIM_MIPS_BITSIZE)
SIM_FLOAT = -DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=$(SIM_MIPS_FPU_BITSIZE)
SIM_BITSIZE = -DWITH_TARGET_WORD_BITSIZE=@SIM_MIPS_BITSIZE@ -DWITH_TARGET_WORD_MSB=WITH_TARGET_WORD_BITSIZE-1
SIM_FLOAT = -DWITH_FLOATING_POINT=HARD_FLOATING_POINT -DWITH_TARGET_FLOATING_POINT_BITSIZE=@SIM_MIPS_FPU_BITSIZE@
SIM_EXTRA_CLEAN = clean-extra
SIM_EXTRA_DISTCLEAN = distclean-extra

View File

@ -1,5 +1,3 @@
dnl TODO: Rename this to acinclude.m4 once mips/configure is removed.
dnl
dnl Copyright (C) 2005-2022 Free Software Foundation, Inc.
dnl
dnl This program is free software; you can redistribute it and/or modify