mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-02-17 13:10:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

sim: v850: 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:07:43 +07:00
parent 4cf83930c1
commit 871aa3b9ee
7 changed files with 27 additions and 2962 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sim/Makefile.in
View File

@ -262,7 +262,7 @@ CONFIG_CLEAN_FILES = Make-common.sim aarch64/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 \
v850/Makefile.sim v850/.gdbinit example-synacor/Makefile.sim \
example-synacor/.gdbinit arch-subdir.mk .gdbinit
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
@ -1801,6 +1801,8 @@ erc32/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/erc32/Makefile.i
cd $(top_builddir) && $(SHELL) ./config.status $@
erc32/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in
cd $(top_builddir) && $(SHELL) ./config.status $@
v850/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/v850/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
v850/.gdbinit: $(top_builddir)/config.status $(top_srcdir)/common/gdbinit.in
cd $(top_builddir) && $(SHELL) ./config.status $@
example-synacor/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/example-synacor/Makefile.in

26
sim/configure vendored
View File

@ -1111,8 +1111,7 @@ AS_FOR_TARGET_EXAMPLE_SYNACOR
LD_FOR_TARGET_EXAMPLE_SYNACOR
CC_FOR_TARGET_EXAMPLE_SYNACOR'
ac_subdirs_all='mips
ppc
v850'
ppc'
# Initialize some variables set by options.
ac_init_help=
@ -12426,7 +12425,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12429 "configure"
#line 12428 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -12532,7 +12531,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12535 "configure"
#line 12534 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -15681,8 +15680,11 @@ fi
SIM_PRIMARY_TARGET=v850
fi
as_fn_append SIM_ENABLED_ARCHES " v850"
subdirs="$subdirs v850"
ac_config_files="$ac_config_files v850/Makefile.sim:v850/Makefile.in"
ac_config_commands="$ac_config_commands v850/Makefile"
as_fn_append SIM_SUBDIRS " v850"
ac_config_files="$ac_config_files v850/.gdbinit:common/gdbinit.in"
@ -17588,6 +17590,8 @@ do
"erc32/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS erc32/Makefile" ;;
"erc32/.gdbinit") CONFIG_FILES="$CONFIG_FILES erc32/.gdbinit:common/gdbinit.in" ;;
"depdir-erc32") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-erc32" ;;
"v850/Makefile.sim") CONFIG_FILES="$CONFIG_FILES v850/Makefile.sim:v850/Makefile.in" ;;
"v850/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS v850/Makefile" ;;
"v850/.gdbinit") CONFIG_FILES="$CONFIG_FILES v850/.gdbinit:common/gdbinit.in" ;;
"depdir-v850") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-v850" ;;
"example-synacor/Makefile.sim") CONFIG_FILES="$CONFIG_FILES example-synacor/Makefile.sim:example-synacor/Makefile.in" ;;
@ -19290,6 +19294,18 @@ $as_echo X"$file" |
rm -f erc32/Makesim1.tmp erc32/Makesim2.tmp
;;
"depdir-erc32":C) $SHELL $ac_aux_dir/mkinstalldirs erc32/$DEPDIR ;;
"v850/Makefile":C) sed -n \
-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {
/^srcdir = / s:$:/v850:
p
}' \
<Make-common.sim >v850/Makesim1.tmp
sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >v850/Makesim2.tmp
sed -e '/^## COMMON_PRE_/ r v850/Makesim1.tmp' \
-e '/^## COMMON_POST_/ r v850/Makesim2.tmp' \
<v850/Makefile.sim >v850/Makefile
rm -f v850/Makesim1.tmp v850/Makesim2.tmp
;;
"depdir-v850":C) $SHELL $ac_aux_dir/mkinstalldirs v850/$DEPDIR ;;
"example-synacor/Makefile":C) sed -n \
-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {

2
sim/configure.ac
View File

@ -155,7 +155,7 @@ if test "${enable_sim}" != no; then
SIM_TARGET([rx-*-*], [rx])
SIM_TARGET([sh*-*-*], [sh])
SIM_TARGET([sparc-*-*], [erc32])
SIM_TARGET([v850*-*-*], [v850], [true], [sim_igen=yes])
SIM_TARGET([v850*-*-*], [v850], [], [sim_igen=yes])
done
if test "x${enable_example_sims}" = xyes; then

2
sim/v850/Makefile.in
View File

@ -23,4 +23,6 @@ SIM_OBJS = \
itable.o semantics.o idecode.o icache.o engine.o irun.o support.o \
sim-resume.o
SIM_EXTRA_CFLAGS = -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31
## COMMON_POST_CONFIG_FRAG

16
sim/v850/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/v850/configure vendored
View File

File diff suppressed because it is too large Load Diff

7
sim/v850/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