diff options
Diffstat (limited to 'sim/lm32')
| -rw-r--r-- | sim/lm32/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/lm32/aclocal.m4 | 1 | ||||
| -rwxr-xr-x | sim/lm32/configure | 58 | ||||
| -rw-r--r-- | sim/lm32/configure.ac | 1 | ||||
| -rw-r--r-- | sim/lm32/sim-if.c | 3 |
5 files changed, 12 insertions, 56 deletions
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog index b511c3f..3223d90 100644 --- a/sim/lm32/ChangeLog +++ b/sim/lm32/ChangeLog @@ -1,5 +1,10 @@ 2021-06-12 Mike Frysinger <vapier@gentoo.org> + * configure.ac: Delete call to SIM_AC_OPTION_ALIGNMENT. + * sim-if.c (sim_open): Set current_alignment. + +2021-06-12 Mike Frysinger <vapier@gentoo.org> + * aclocal.m4, config.in, configure: Regenerate. 2021-06-12 Mike Frysinger <vapier@gentoo.org> diff --git a/sim/lm32/aclocal.m4 b/sim/lm32/aclocal.m4 index 948b368..4fb0bd7 100644 --- a/sim/lm32/aclocal.m4 +++ b/sim/lm32/aclocal.m4 @@ -110,7 +110,6 @@ m4_include([../../ltsugar.m4]) m4_include([../../ltversion.m4]) m4_include([../../lt~obsolete.m4]) m4_include([../m4/sim_ac_common.m4]) -m4_include([../m4/sim_ac_option_alignment.m4]) m4_include([../m4/sim_ac_option_cgen_maint.m4]) m4_include([../m4/sim_ac_option_default_model.m4]) m4_include([../m4/sim_ac_option_endian.m4]) diff --git a/sim/lm32/configure b/sim/lm32/configure index 9b732c9..679488d 100755 --- a/sim/lm32/configure +++ b/sim/lm32/configure @@ -634,6 +634,7 @@ LIBOBJS sim_reserved_bits sim_float sim_bitsize +sim_alignment cgen_breaks cgen cgendir @@ -756,8 +757,7 @@ sim_hw sim_hw_objs sim_hw_cflags sim_endian -sim_default_model -sim_alignment' +sim_default_model' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -772,7 +772,6 @@ enable_libtool_lock enable_maintainer_mode enable_sim_inline enable_sim_endian -enable_sim_alignment enable_sim_scache enable_sim_default_model enable_werror @@ -1420,9 +1419,6 @@ Optional Features: Specify which functions should be inlined --enable-sim-endian=endian Specify target byte endian orientation - --enable-sim-alignment=align - Specify strict, nonstrict or forced alignment of - memory accesses --enable-sim-scache=size Specify simulator execution cache size --enable-sim-default-model=model @@ -10759,7 +10755,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10762 "configure" +#line 10758 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10865,7 +10861,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10868 "configure" +#line 10864 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11207,52 +11203,6 @@ else fi fi -wire_alignment="STRICT_ALIGNMENT" -default_alignment="STRICT_ALIGNMENT" - -# Check whether --enable-sim-alignment was given. -if test "${enable_sim_alignment+set}" = set; then : - enableval=$enable_sim_alignment; case "${enableval}" in - strict | STRICT) sim_alignment="-DWITH_ALIGNMENT=STRICT_ALIGNMENT";; - nonstrict | NONSTRICT) sim_alignment="-DWITH_ALIGNMENT=NONSTRICT_ALIGNMENT";; - forced | FORCED) sim_alignment="-DWITH_ALIGNMENT=FORCED_ALIGNMENT";; - yes) if test x"$wire_alignment" != x; then - sim_alignment="-DWITH_ALIGNMENT=${wire_alignment}" - else - if test x"$default_alignment" != x; then - sim_alignment="-DWITH_ALIGNMENT=${default_alignment}" - else - echo "No hard-wired alignment for target $target" 1>&6 - sim_alignment="-DWITH_ALIGNMENT=0" - fi - fi;; - no) if test x"$default_alignment" != x; then - sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${default_alignment}" - else - if test x"$wire_alignment" != x; then - sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${wire_alignment}" - else - echo "No default alignment for target $target" 1>&6 - sim_alignment="-DWITH_DEFAULT_ALIGNMENT=0" - fi - fi;; - *) as_fn_error $? "\"Unknown value $enableval passed to --enable-sim-alignment\"" "$LINENO" 5; sim_alignment="";; -esac -if test x"$silent" != x"yes" && test x"$sim_alignment" != x""; then - echo "Setting alignment flags = $sim_alignment" 6>&1 -fi -else - if test x"$default_alignment" != x; then - sim_alignment="-DWITH_DEFAULT_ALIGNMENT=${default_alignment}" -else - if test x"$wire_alignment" != x; then - sim_alignment="-DWITH_ALIGNMENT=${wire_alignment}" - else - sim_alignment= - fi -fi -fi - default_sim_scache="16384" # Check whether --enable-sim-scache was given. diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac index 6354887..4a20374 100644 --- a/sim/lm32/configure.ac +++ b/sim/lm32/configure.ac @@ -5,7 +5,6 @@ AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config]) SIM_AC_COMMON SIM_AC_OPTION_ENDIAN(BIG) -SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT) SIM_AC_OPTION_SCACHE(16384) SIM_AC_OPTION_DEFAULT_MODEL(lm32) SIM_AC_OPTION_WARNINGS(no) diff --git a/sim/lm32/sim-if.c b/sim/lm32/sim-if.c index 3d4ee35..fba2d63 100644 --- a/sim/lm32/sim-if.c +++ b/sim/lm32/sim-if.c @@ -91,6 +91,9 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, int i; unsigned long base, limit; + /* Set default options before parsing user options. */ + current_alignment = STRICT_ALIGNMENT; + /* The cpu data is kept in a separately allocated chunk of memory. */ if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK) { |