From 7eb1f99adaa3515463b6082e4a911d8b334e852f Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 1 Jul 2021 01:04:48 -0400
Subject: sim: unify reserved instruction bits settings

Move these options up to the common dir so we only test & export
them once across all ports.

The setting only affects igen based ports, and they were turning
this on by default, so keep the default in place.
---
 sim/mn10300/ChangeLog    |  6 ++++++
 sim/mn10300/aclocal.m4   |  1 -
 sim/mn10300/configure    | 22 ----------------------
 sim/mn10300/configure.ac |  1 -
 4 files changed, 6 insertions(+), 24 deletions(-)

(limited to 'sim/mn10300')

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index b983278..a4ff98a 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,9 @@
+2021-07-01  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac: Delete SIM_AC_OPTION_RESERVED_BITS call.
+	* aclocal.m4: Regenerate.
+	* configure: Regenerate.
+
 2021-06-30  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/mn10300/aclocal.m4 b/sim/mn10300/aclocal.m4
index f4393af..3b7f0c1 100644
--- a/sim/mn10300/aclocal.m4
+++ b/sim/mn10300/aclocal.m4
@@ -13,5 +13,4 @@
 
 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_option_reserved_bits.m4])
 m4_include([../m4/sim_ac_output.m4])
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index e6f39fc..46e30c1 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -626,12 +626,10 @@ PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL
-sim_reserved_bits
 sim_bitsize'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_sim_reserved_bits
 enable_sim_bitsize
 '
       ac_precious_vars='build_alias
@@ -1244,9 +1242,6 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-sim-reserved-bits
-                          Specify whether to check reserved bits in
-                          instruction
   --enable-sim-bitsize=N  Specify target bitsize (32 or 64)
 
 Report bugs to the package provider.
@@ -1679,22 +1674,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-default_sim_reserved_bits="1"
-# Check whether --enable-sim-reserved-bits was given.
-if test "${enable_sim_reserved_bits+set}" = set; then :
-  enableval=$enable_sim_reserved_bits; case "${enableval}" in
-  yes)	sim_reserved_bits="-DWITH_RESERVED_BITS=1";;
-  no)	sim_reserved_bits="-DWITH_RESERVED_BITS=0";;
-  *)	as_fn_error $? "\"--enable-sim-reserved-bits does not take a value\"" "$LINENO" 5; sim_reserved_bits="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_reserved_bits" != x""; then
-  echo "Setting reserved flags = $sim_reserved_bits" 6>&1
-fi
-else
-  sim_reserved_bits="-DWITH_RESERVED_BITS=${default_sim_reserved_bits}"
-fi
-
 wire_word_bitsize="32"
 wire_word_msb="31"
 wire_address_bitsize=""
@@ -1774,7 +1753,6 @@ ac_config_commands="$ac_config_commands stamp-h"
 
 
 
-
 SIM_COMMON_BUILD_TRUE='#'
 SIM_COMMON_BUILD_FALSE=
 
diff --git a/sim/mn10300/configure.ac b/sim/mn10300/configure.ac
index 74eb1fa..1fa7c0e 100644
--- a/sim/mn10300/configure.ac
+++ b/sim/mn10300/configure.ac
@@ -2,7 +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_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)
 
 SIM_AC_OUTPUT
-- 
cgit v1.1