diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-12-24 21:29:55 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2022-12-24 22:13:56 -0500 |
| commit | 23ddbd2f2bfc6ab17afb805a70f145ee7af524ea (patch) | |
| tree | 83ac409c70ef32e133d81fa249e5b9aae398523e /sim | |
| parent | abc494c65d640626891408d551a0fe1842e728e3 (diff) | |
| download | fsf-binutils-gdb-23ddbd2f2bfc6ab17afb805a70f145ee7af524ea.zip fsf-binutils-gdb-23ddbd2f2bfc6ab17afb805a70f145ee7af524ea.tar.gz fsf-binutils-gdb-23ddbd2f2bfc6ab17afb805a70f145ee7af524ea.tar.bz2 | |
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.
Diffstat (limited to 'sim')
| -rw-r--r-- | sim/Makefile.in | 3 | ||||
| -rw-r--r-- | sim/arch-subdir.mk.in | 5 | ||||
| -rw-r--r-- | sim/configure.ac | 2 | ||||
| -rw-r--r-- | sim/mips/Makefile.in | 6 | ||||
| -rw-r--r-- | sim/mips/acinclude.m4 (renamed from sim/mips/acinclude-top.m4) | 2 |
5 files changed, 5 insertions, 13 deletions
diff --git a/sim/Makefile.in b/sim/Makefile.in index 02b78c5..7cd86b5 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -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) \ diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in index 8964b1d..cfde3f3 100644 --- a/sim/arch-subdir.mk.in +++ b/sim/arch-subdir.mk.in @@ -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@ diff --git a/sim/configure.ac b/sim/configure.ac index e17dd97..bfcd9e5 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -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]) diff --git a/sim/mips/Makefile.in b/sim/mips/Makefile.in index 0e2f105..c287a63 100644 --- a/sim/mips/Makefile.in +++ b/sim/mips/Makefile.in @@ -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 diff --git a/sim/mips/acinclude-top.m4 b/sim/mips/acinclude.m4 index ca11a27..0a8bf97 100644 --- a/sim/mips/acinclude-top.m4 +++ b/sim/mips/acinclude.m4 @@ -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 |