mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-27 03:54:41 +08:00
sim: mips: rename multi_flags to igen_itable_flags
This variable is only used to generate the itable files. In preparation for merging the itable logic among all ports, rename "multi_flags" to a more appropriate "igen_itable_flags" variable. There should be no real chagnes here otherwise.
This commit is contained in:
parent
556ca380d7
commit
4c45662c0f
@ -1114,8 +1114,8 @@ SIM_MIPS_BITSIZE = @SIM_MIPS_BITSIZE@
|
||||
SIM_MIPS_FPU_BITSIZE = @SIM_MIPS_FPU_BITSIZE@
|
||||
SIM_MIPS_GEN = @SIM_MIPS_GEN@
|
||||
SIM_MIPS_IGEN_FLAGS = @SIM_MIPS_IGEN_FLAGS@
|
||||
SIM_MIPS_IGEN_ITABLE_FLAGS = @SIM_MIPS_IGEN_ITABLE_FLAGS@
|
||||
SIM_MIPS_M16_FLAGS = @SIM_MIPS_M16_FLAGS@
|
||||
SIM_MIPS_MULTI_FLAGS = @SIM_MIPS_MULTI_FLAGS@
|
||||
SIM_MIPS_MULTI_IGEN_CONFIGS = @SIM_MIPS_MULTI_IGEN_CONFIGS@
|
||||
SIM_MIPS_MULTI_OBJ = @SIM_MIPS_MULTI_OBJ@
|
||||
SIM_MIPS_MULTI_SRC = @SIM_MIPS_MULTI_SRC@
|
||||
|
12
sim/configure
vendored
12
sim/configure
vendored
@ -644,7 +644,7 @@ SIM_RISCV_BITSIZE
|
||||
SIM_MIPS_MULTI_OBJ
|
||||
SIM_MIPS_MULTI_SRC
|
||||
SIM_MIPS_MULTI_IGEN_CONFIGS
|
||||
SIM_MIPS_MULTI_FLAGS
|
||||
SIM_MIPS_IGEN_ITABLE_FLAGS
|
||||
SIM_MIPS_GEN
|
||||
SIM_MIPS_M16_FLAGS
|
||||
SIM_MIPS_IGEN_FLAGS
|
||||
@ -16463,7 +16463,7 @@ case ${target} in #(
|
||||
;;
|
||||
esac
|
||||
|
||||
SIM_MIPS_MULTI_FLAGS=
|
||||
SIM_MIPS_IGEN_ITABLE_FLAGS=
|
||||
SIM_MIPS_MULTI_SRC=
|
||||
SIM_MIPS_MULTI_OBJ=
|
||||
SIM_MIPS_MULTI_IGEN_CONFIGS=
|
||||
@ -16538,7 +16538,7 @@ __EOF__
|
||||
machine=`echo ${c} | sed 's/.*:\(.*\):.*/\1/'`
|
||||
filter=`echo ${c} | sed 's/.*://'`
|
||||
|
||||
as_fn_append SIM_MIPS_MULTI_FLAGS " -F ${filter} -M ${machine}"
|
||||
as_fn_append SIM_MIPS_IGEN_ITABLE_FLAGS " -F ${filter} -M ${machine}"
|
||||
|
||||
case ${c} in #(
|
||||
*:*mips16*:*) :
|
||||
@ -16546,21 +16546,21 @@ __EOF__
|
||||
|
||||
as_fn_append SIM_MIPS_MULTI_SRC " m16${name}_run.c"
|
||||
as_fn_append SIM_MIPS_MULTI_OBJ " m16${name}_run.o"
|
||||
as_fn_append SIM_MIPS_MULTI_FLAGS " -F 16"
|
||||
as_fn_append SIM_MIPS_IGEN_ITABLE_FLAGS " -F 16"
|
||||
;; #(
|
||||
*:*micromips32*:*) :
|
||||
ws="micromips_m32 micromips16 micromips32"
|
||||
|
||||
as_fn_append SIM_MIPS_MULTI_SRC " micromips${name}_run.c"
|
||||
as_fn_append SIM_MIPS_MULTI_OBJ " micromips${name}_run.o"
|
||||
as_fn_append SIM_MIPS_MULTI_FLAGS " -F 16,32"
|
||||
as_fn_append SIM_MIPS_IGEN_ITABLE_FLAGS " -F 16,32"
|
||||
;; #(
|
||||
*:*micromips64*:*) :
|
||||
ws="micromips_m64 micromips16 micromips64"
|
||||
|
||||
as_fn_append SIM_MIPS_MULTI_SRC " micromips${name}_run.c"
|
||||
as_fn_append SIM_MIPS_MULTI_OBJ " micromips${name}_run.o"
|
||||
as_fn_append SIM_MIPS_MULTI_FLAGS " -F 16,32,64"
|
||||
as_fn_append SIM_MIPS_IGEN_ITABLE_FLAGS " -F 16,32,64"
|
||||
;; #(
|
||||
*) :
|
||||
ws=m32 ;;
|
||||
|
@ -6,7 +6,7 @@
|
||||
SIM_MIPS_IGEN_FLAGS = @SIM_MIPS_IGEN_FLAGS@
|
||||
SIM_MIPS_M16_FLAGS = @SIM_MIPS_M16_FLAGS@
|
||||
SIM_MIPS_GEN = @SIM_MIPS_GEN@
|
||||
SIM_MIPS_MULTI_FLAGS = @SIM_MIPS_MULTI_FLAGS@
|
||||
SIM_MIPS_IGEN_ITABLE_FLAGS = @SIM_MIPS_IGEN_ITABLE_FLAGS@
|
||||
SIM_MIPS_MULTI_IGEN_CONFIGS = @SIM_MIPS_MULTI_IGEN_CONFIGS@
|
||||
SIM_MIPS_MULTI_SRC = @SIM_MIPS_MULTI_SRC@
|
||||
SIM_MIPS_MULTI_OBJ = @SIM_MIPS_MULTI_OBJ@
|
||||
@ -299,7 +299,7 @@ tmp-itable-multi: $(IGEN_INSN) $(IGEN_DC) $(IGEN) $(IGEN_INCLUDE)
|
||||
-Werror \
|
||||
-Wnodiscard \
|
||||
-Wnowidth \
|
||||
$(SIM_MIPS_MULTI_FLAGS) \
|
||||
$(SIM_MIPS_IGEN_ITABLE_FLAGS) \
|
||||
-G gen-direct-access \
|
||||
-G gen-zero-r0 \
|
||||
-i $(IGEN_INSN) \
|
||||
|
@ -153,7 +153,7 @@ dnl The simulator compares the bfd mach against BFDMACHS to decide
|
||||
dnl which engine to use. Entries in BFDMACHS should be bfd_mach
|
||||
dnl values with "bfd_mach_" removed. ${sim_mips_multi_default} says
|
||||
dnl which entry should be the default.
|
||||
SIM_MIPS_MULTI_FLAGS=
|
||||
SIM_MIPS_IGEN_ITABLE_FLAGS=
|
||||
SIM_MIPS_MULTI_SRC=
|
||||
SIM_MIPS_MULTI_OBJ=
|
||||
SIM_MIPS_MULTI_IGEN_CONFIGS=
|
||||
@ -233,7 +233,7 @@ __EOF__
|
||||
|
||||
dnl Build the following lists:
|
||||
dnl
|
||||
dnl SIM_MIPS_MULTI_FLAGS: all -M and -F flags used by the simulator
|
||||
dnl SIM_MIPS_IGEN_ITABLE_FLAGS: all -M and -F flags used by the simulator
|
||||
dnl SIM_MIPS_MULTI_SRC: all makefile-generated source files
|
||||
dnl SIM_MIPS_MULTI_OBJ: the objects for ${SIM_MIPS_MULTI_SRC}
|
||||
dnl SIM_MIPS_MULTI_IGEN_CONFIGS: igen configuration strings.
|
||||
@ -241,7 +241,7 @@ __EOF__
|
||||
dnl Each entry in ${SIM_MIPS_MULTI_IGEN_CONFIGS} is a prefix (m32
|
||||
dnl or m16) followed by the NAME, MACHINE and FILTER part of
|
||||
dnl the ${sim_mips_multi_configs} entry.
|
||||
AS_VAR_APPEND([SIM_MIPS_MULTI_FLAGS], [" -F ${filter} -M ${machine}"])
|
||||
AS_VAR_APPEND([SIM_MIPS_IGEN_ITABLE_FLAGS], [" -F ${filter} -M ${machine}"])
|
||||
|
||||
dnl Check whether special handling is needed.
|
||||
AS_CASE([${c}],
|
||||
@ -254,7 +254,7 @@ __EOF__
|
||||
dnl tmp-run-multi Makefile rule.
|
||||
AS_VAR_APPEND([SIM_MIPS_MULTI_SRC], [" m16${name}_run.c"])
|
||||
AS_VAR_APPEND([SIM_MIPS_MULTI_OBJ], [" m16${name}_run.o"])
|
||||
AS_VAR_APPEND([SIM_MIPS_MULTI_FLAGS], [" -F 16"])
|
||||
AS_VAR_APPEND([SIM_MIPS_IGEN_ITABLE_FLAGS], [" -F 16"])
|
||||
],
|
||||
[*:*micromips32*:*], [dnl
|
||||
dnl Run igen thrice, once for micromips32, once for micromips16,
|
||||
@ -266,7 +266,7 @@ __EOF__
|
||||
dnl tmp-run-multi Makefile rule.
|
||||
AS_VAR_APPEND([SIM_MIPS_MULTI_SRC], [" micromips${name}_run.c"])
|
||||
AS_VAR_APPEND([SIM_MIPS_MULTI_OBJ], [" micromips${name}_run.o"])
|
||||
AS_VAR_APPEND([SIM_MIPS_MULTI_FLAGS], [" -F 16,32"])
|
||||
AS_VAR_APPEND([SIM_MIPS_IGEN_ITABLE_FLAGS], [" -F 16,32"])
|
||||
],
|
||||
[*:*micromips64*:*], [dnl
|
||||
dnl Run igen thrice, once for micromips64, once for micromips16,
|
||||
@ -278,7 +278,7 @@ __EOF__
|
||||
dnl tmp-run-multi Makefile rule.
|
||||
AS_VAR_APPEND([SIM_MIPS_MULTI_SRC], [" micromips${name}_run.c"])
|
||||
AS_VAR_APPEND([SIM_MIPS_MULTI_OBJ], [" micromips${name}_run.o"])
|
||||
AS_VAR_APPEND([SIM_MIPS_MULTI_FLAGS], [" -F 16,32,64"])
|
||||
AS_VAR_APPEND([SIM_MIPS_IGEN_ITABLE_FLAGS], [" -F 16,32,64"])
|
||||
],
|
||||
[ws=m32])
|
||||
|
||||
@ -327,7 +327,7 @@ SIM_MIPS_M16_FLAGS="-F ${sim_mips_m16_filter} ${sim_mips_m16_machine}"
|
||||
AC_SUBST(SIM_MIPS_IGEN_FLAGS)
|
||||
AC_SUBST(SIM_MIPS_M16_FLAGS)
|
||||
AC_SUBST(SIM_MIPS_GEN)
|
||||
AC_SUBST(SIM_MIPS_MULTI_FLAGS)
|
||||
AC_SUBST(SIM_MIPS_IGEN_ITABLE_FLAGS)
|
||||
AC_SUBST(SIM_MIPS_MULTI_IGEN_CONFIGS)
|
||||
AC_SUBST(SIM_MIPS_MULTI_SRC)
|
||||
AC_SUBST(SIM_MIPS_MULTI_OBJ)
|
||||
|
Loading…
Reference in New Issue
Block a user