From 7d554943ba2f60d7562a7f7360b683885313dec8 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 30 Nov 2021 02:30:46 -0500 Subject: [PATCH] sim: mips/or1k: drop redundant arg to bitsize macro These are just using the default behavior for the 3rd arg, so drop it to make it more clear. This also makes them match all other ports that only use the first 2 arguments. --- sim/mips/configure | 3 +-- sim/mips/configure.ac | 3 +-- sim/or1k/configure | 2 +- sim/or1k/configure.ac | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sim/mips/configure b/sim/mips/configure index 7627d73fe66..2521ce8638d 100755 --- a/sim/mips/configure +++ b/sim/mips/configure @@ -1709,7 +1709,6 @@ esac # # Select the bitsize of the target # -mips_addr_bitsize= case "${target}" in mips*-sde-elf*) mips_bitsize=64 ; mips_msb=63 ;; mips*-mti-elf*) mips_bitsize=64 ; mips_msb=63 ;; @@ -1722,7 +1721,7 @@ case "${target}" in esac wire_word_bitsize="$mips_bitsize" wire_word_msb="$mips_msb" -wire_address_bitsize="$mips_addr_bitsize" +wire_address_bitsize="" wire_cell_bitsize="" # Check whether --enable-sim-bitsize was given. if test "${enable_sim_bitsize+set}" = set; then : diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac index 9430923d89a..3277ebefbb3 100644 --- a/sim/mips/configure.ac +++ b/sim/mips/configure.ac @@ -24,7 +24,6 @@ AC_SUBST(SIM_SUBTARGET) # # Select the bitsize of the target # -mips_addr_bitsize= case "${target}" in mips*-sde-elf*) mips_bitsize=64 ; mips_msb=63 ;; mips*-mti-elf*) mips_bitsize=64 ; mips_msb=63 ;; @@ -35,7 +34,7 @@ case "${target}" in mips*-*-*) mips_bitsize=32 ; mips_msb=31 ;; *) mips_bitsize=64 ; mips_msb=63 ;; esac -SIM_AC_OPTION_BITSIZE($mips_bitsize,$mips_msb,$mips_addr_bitsize) +SIM_AC_OPTION_BITSIZE($mips_bitsize,$mips_msb) diff --git a/sim/or1k/configure b/sim/or1k/configure index 8dc888458f3..46e30c1cff0 100755 --- a/sim/or1k/configure +++ b/sim/or1k/configure @@ -1676,7 +1676,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu wire_word_bitsize="32" wire_word_msb="31" -wire_address_bitsize="32" +wire_address_bitsize="" wire_cell_bitsize="" # Check whether --enable-sim-bitsize was given. if test "${enable_sim_bitsize+set}" = set; then : diff --git a/sim/or1k/configure.ac b/sim/or1k/configure.ac index 4a989e3fc4f..a0fe51c897b 100644 --- a/sim/or1k/configure.ac +++ b/sim/or1k/configure.ac @@ -2,6 +2,6 @@ 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], [32]) +SIM_AC_OPTION_BITSIZE([32], [31]) SIM_AC_OUTPUT -- 2.30.2