Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

sim: riscv: drop subdir configure logic

Browse Source 
We've been using this only to set the default word size to 32-vs-64
based on the $target.  We can easily merge this with the top-level
configure script to clean things up a bit.
This commit is contained in:
Mike Frysinger
2022-11-07 22:56:58 +07:00
parent b686ecb5b1
commit 1787fcc45a
8 changed files with 65 additions and 3138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sim/configure vendored
View File

@@ -640,6 +640,7 @@ am__EXEEXT_TRUE
LTLIBOBJS
include_makefile
SIM_RX_CYCLE_ACCURATE_FLAGS
SIM_RISCV_BITSIZE
SIM_FRV_TRAPDUMP_FLAGS
sim_float
sim_bitsize
@@ -1114,7 +1115,6 @@ mips
mn10300
or1k
ppc
riscv
v850'
# Initialize some variables set by options.
@@ -15455,8 +15455,11 @@ fi
SIM_PRIMARY_TARGET=riscv
fi
as_fn_append SIM_ENABLED_ARCHES " riscv"
subdirs="$subdirs riscv"
ac_config_files="$ac_config_files riscv/Makefile.sim:riscv/Makefile.in"
ac_config_commands="$ac_config_commands riscv/Makefile"
as_fn_append SIM_SUBDIRS " riscv"
ac_config_files="$ac_config_files riscv/.gdbinit:common/gdbinit.in"
@@ -16259,6 +16262,17 @@ $as_echo "no" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking riscv bitsize" >&5
$as_echo_n "checking riscv bitsize... " >&6; }
SIM_RISCV_BITSIZE=64
case $target in #(
riscv32*) :
SIM_RISCV_BITSIZE=32 ;; #(
*) :
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sim rx should be cycle accurate" >&5
$as_echo_n "checking whether sim rx should be cycle accurate... " >&6; }
# Check whether --enable-sim-rx-cycle-accurate was given.
@@ -17542,6 +17556,8 @@ do
"pru/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS pru/Makefile" ;;
"pru/.gdbinit") CONFIG_FILES="$CONFIG_FILES pru/.gdbinit:common/gdbinit.in" ;;
"depdir-pru") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-pru" ;;
"riscv/Makefile.sim") CONFIG_FILES="$CONFIG_FILES riscv/Makefile.sim:riscv/Makefile.in" ;;
"riscv/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS riscv/Makefile" ;;
"riscv/.gdbinit") CONFIG_FILES="$CONFIG_FILES riscv/.gdbinit:common/gdbinit.in" ;;
"depdir-riscv") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-riscv" ;;
"rl78/Makefile.sim") CONFIG_FILES="$CONFIG_FILES rl78/Makefile.sim:rl78/Makefile.in" ;;
@@ -19161,6 +19177,18 @@ $as_echo X"$file" |
rm -f pru/Makesim1.tmp pru/Makesim2.tmp
;;
"depdir-pru":C) $SHELL $ac_aux_dir/mkinstalldirs pru/$DEPDIR ;;
"riscv/Makefile":C) sed -n \
-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {
/^srcdir = / s:$:/riscv:
p
}' \
<Make-common.sim >riscv/Makesim1.tmp
sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >riscv/Makesim2.tmp
sed -e '/^## COMMON_PRE_/ r riscv/Makesim1.tmp' \
-e '/^## COMMON_POST_/ r riscv/Makesim2.tmp' \
<riscv/Makefile.sim >riscv/Makefile
rm -f riscv/Makesim1.tmp riscv/Makesim2.tmp
;;
"depdir-riscv":C) $SHELL $ac_aux_dir/mkinstalldirs riscv/$DEPDIR ;;
"rl78/Makefile":C) sed -n \
-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {