yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sim: mn10300: drop subdir configure logic

Browse Source 
We've been using this only to set the default word size to 32.  We
can easily move this into the makefile via a -D compiler flag and
clean up the build logic quite a bit.
This commit is contained in:
Mike Frysinger 2022-11-07 23:05:46 +07:00
parent 763b20abcb
commit 4cf83930c1
7 changed files with 34 additions and 2969 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sim/Makefile.in
View File

@ -256,14 +256,14 @@ CONFIG_CLEAN_FILES = Make-common.sim aarch64/Makefile.sim \
m32r/Makefile.sim m32r/.gdbinit m68hc11/Makefile.sim \
m68hc11/.gdbinit mcore/Makefile.sim mcore/.gdbinit \
microblaze/Makefile.sim microblaze/.gdbinit mips/.gdbinit \
mn10300/.gdbinit moxie/Makefile.sim moxie/.gdbinit \
msp430/Makefile.sim msp430/.gdbinit or1k/Makefile.sim \
or1k/.gdbinit ppc/.gdbinit pru/Makefile.sim pru/.gdbinit \
riscv/Makefile.sim riscv/.gdbinit rl78/Makefile.sim \
rl78/.gdbinit rx/Makefile.sim rx/.gdbinit sh/Makefile.sim \
sh/.gdbinit erc32/Makefile.sim erc32/.gdbinit v850/.gdbinit \
example-synacor/Makefile.sim example-synacor/.gdbinit \
arch-subdir.mk .gdbinit
mn10300/Makefile.sim mn10300/.gdbinit moxie/Makefile.sim \
moxie/.gdbinit msp430/Makefile.sim msp430/.gdbinit \
or1k/Makefile.sim or1k/.gdbinit ppc/.gdbinit pru/Makefile.sim \
pru/.gdbinit riscv/Makefile.sim riscv/.gdbinit \
rl78/Makefile.sim rl78/.gdbinit rx/Makefile.sim rx/.gdbinit \
sh/Makefile.sim sh/.gdbinit erc32/Makefile.sim erc32/.gdbinit \
v850/.gdbinit example-synacor/Makefile.sim \
example-synacor/.gdbinit arch-subdir.mk .gdbinit
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
@ -1759,6 +1759,8 @@ microblaze/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.
cd $(top_builddir) && $(SHELL) ./config.status $@
mips/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in
cd $(top_builddir) && $(SHELL) ./config.status $@
mn10300/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/mn10300/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
mn10300/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in
cd $(top_builddir) && $(SHELL) ./config.status $@
moxie/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/moxie/Makefile.in

24
sim/configure vendored
View File

@ -1111,7 +1111,6 @@ AS_FOR_TARGET_EXAMPLE_SYNACOR
LD_FOR_TARGET_EXAMPLE_SYNACOR
CC_FOR_TARGET_EXAMPLE_SYNACOR'
ac_subdirs_all='mips
mn10300
ppc
v850'
@ -12427,7 +12426,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12430 "configure"
#line 12429 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -12533,7 +12532,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12536 "configure"
#line 12535 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -15201,8 +15200,11 @@ fi
SIM_PRIMARY_TARGET=mn10300
fi
as_fn_append SIM_ENABLED_ARCHES " mn10300"
subdirs="$subdirs mn10300"
ac_config_files="$ac_config_files mn10300/Makefile.sim:mn10300/Makefile.in"
ac_config_commands="$ac_config_commands mn10300/Makefile"
as_fn_append SIM_SUBDIRS " mn10300"
ac_config_files="$ac_config_files mn10300/.gdbinit:common/gdbinit.in"
@ -17544,6 +17546,8 @@ do
"depdir-microblaze") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-microblaze" ;;
"mips/.gdbinit") CONFIG_FILES="$CONFIG_FILES mips/.gdbinit:common/gdbinit.in" ;;
"depdir-mips") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-mips" ;;
"mn10300/Makefile.sim") CONFIG_FILES="$CONFIG_FILES mn10300/Makefile.sim:mn10300/Makefile.in" ;;
"mn10300/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS mn10300/Makefile" ;;
"mn10300/.gdbinit") CONFIG_FILES="$CONFIG_FILES mn10300/.gdbinit:common/gdbinit.in" ;;
"depdir-mn10300") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-mn10300" ;;
"moxie/Makefile.sim") CONFIG_FILES="$CONFIG_FILES moxie/Makefile.sim:moxie/Makefile.in" ;;
@ -19155,6 +19159,18 @@ $as_echo X"$file" |
;;
"depdir-microblaze":C) $SHELL $ac_aux_dir/mkinstalldirs microblaze/$DEPDIR ;;
"depdir-mips":C) $SHELL $ac_aux_dir/mkinstalldirs mips/$DEPDIR ;;
"mn10300/Makefile":C) sed -n \
-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {
/^srcdir = / s:$:/mn10300:
p
}' \
<Make-common.sim >mn10300/Makesim1.tmp
sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >mn10300/Makesim2.tmp
sed -e '/^## COMMON_PRE_/ r mn10300/Makesim1.tmp' \
-e '/^## COMMON_POST_/ r mn10300/Makesim2.tmp' \
<mn10300/Makefile.sim >mn10300/Makefile
rm -f mn10300/Makesim1.tmp mn10300/Makesim2.tmp
;;
"depdir-mn10300":C) $SHELL $ac_aux_dir/mkinstalldirs mn10300/$DEPDIR ;;
"moxie/Makefile":C) sed -n \
-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {

2
sim/configure.ac
View File

@ -144,7 +144,7 @@ if test "${enable_sim}" != no; then
SIM_TARGET([mcore-*-*], [mcore])
SIM_TARGET([microblaze*-*-*], [microblaze])
SIM_TARGET([mips*-*-*], [mips], [true], [sim_igen=yes])
SIM_TARGET([mn10300*-*-*], [mn10300], [true], [sim_igen=yes])
SIM_TARGET([mn10300*-*-*], [mn10300], [], [sim_igen=yes])
SIM_TARGET([moxie-*-*], [moxie])
SIM_TARGET([msp430*-*-*], [msp430])
SIM_TARGET([or1k*-*-*], [or1k])

4
sim/mn10300/Makefile.in
View File

@ -28,6 +28,8 @@ SIM_OBJS = $(MN10300_OBJS) interp.o
SIM_EXTRA_HW_DEVICES = mn103cpu mn103int mn103tim mn103ser mn103iop
# List of extra flags to always pass to $(CC).
SIM_EXTRA_CFLAGS = -DPOLL_QUIT_INTERVAL=0x20
SIM_EXTRA_CFLAGS = \
-DPOLL_QUIT_INTERVAL=0x20 \
-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31
## COMMON_POST_CONFIG_FRAG

16
sim/mn10300/aclocal.m4 vendored
View File

@ -1,16 +0,0 @@
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# 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([../m4/sim_ac_option_bitsize.m4])
m4_include([../m4/sim_ac_output.m4])

2932
sim/mn10300/configure vendored
View File

File diff suppressed because it is too large Load Diff

7
sim/mn10300/configure.ac
View File

@ -1,7 +0,0 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(Makefile.in)
AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
SIM_AC_OPTION_BITSIZE(32,31)
SIM_AC_OUTPUT