sim: punt x86-specific bswap logic

The compiler/C library should produce reasonable code for htonl/ntohl,
and at least glibc tries pretty hard to always produce good code for
them.  This logic only had support for 32-bit x86 systems anymore, and
it's unlikely people were even opting into this, so drop it all.

68 files changed, 187 insertions, 699 deletions

diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index 24a4eb0..14f4c3c 100644
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
diff --git a/sim/aarch64/configure b/sim/aarch64/configure
index a927ffd..c768886 100755
--- a/sim/aarch64/configure
+++ b/sim/aarch64/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1403,7 +1401,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12531,7 +12528,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12534 "configure"
+#line 12531 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12637,7 +12634,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12640 "configure"
+#line 12637 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12905,22 +12902,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 2e846ef..8b83ef3 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* wrapper.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/arm/configure b/sim/arm/configure
index d7445d3..ac97233 100755
--- a/sim/arm/configure
+++ b/sim/arm/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1403,7 +1401,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12531,7 +12528,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12534 "configure"
+#line 12531 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12637,7 +12634,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12640 "configure"
+#line 12637 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12905,22 +12902,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 27d1e27..3398eb1 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/avr/configure b/sim/avr/configure
index 9e94d99..d172c65 100755
--- a/sim/avr/configure
+++ b/sim/avr/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1403,7 +1401,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12531,7 +12528,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12534 "configure"
+#line 12531 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12637,7 +12634,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12640 "configure"
+#line 12637 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12905,22 +12902,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 67612b2..7c16fde 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/bfin/configure b/sim/bfin/configure
index 4617cca..ae49198 100755
--- a/sim/bfin/configure
+++ b/sim/bfin/configure
@@ -614,7 +614,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -757,7 +756,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1415,7 +1413,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12554,7 +12551,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12557 "configure"
+#line 12554 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12660,7 +12657,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12663 "configure"
+#line 12660 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12928,22 +12925,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 9de5238..97a170a 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,12 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* acinclude.m4 (sim-bswap): Delete.
+	* configure: Regenerate.
+	* Make-common.in (SIM_BSWAP): Delete.
+	(CONFIG_CFLAGS): Delete $(SIM_BSWAP).
+	* sim-config.h (htonl, ntohl): Delete.
+	(WITH_BSWAP): Delete.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-options.c (sim_parse_args): Declare local save_opterr.  Save
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 36497e7..6fdf10f 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -75,7 +75,6 @@ CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CXXFLAGS = @CXXFLAGS@
 LDFLAGS = @LDFLAGS@
-SIM_BSWAP = @sim_bswap@
 SIM_CFLAGS = @sim_cflags@
 SIM_DEBUG = @sim_debug@
 SIM_TRACE = @sim_trace@
@@ -234,7 +233,6 @@ CONFIG_CFLAGS = \
 	$(SIM_DEFAULT_MODEL) \
 	$(SIM_TRACE) \
 	$(SIM_PROFILE) \
-	$(SIM_BSWAP) \
 	$(SIM_ASSERT) \
 	$(SIM_ALIGNMENT) \
 	$(SIM_BITSIZE) \
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index 9529337..47bc2de 100644
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@@ -117,21 +117,6 @@ dnl --enable-maintainer-mode.
 AM_MAINTAINER_MODE
 
 
-dnl This is a generic option to enable special byte swapping
-dnl insns on *any* cpu.
-AC_ARG_ENABLE(sim-bswap,
-[AS_HELP_STRING([--enable-sim-bswap], [Use Host specific BSWAP instruction])],
-[case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	AC_MSG_ERROR("--enable-sim-bswap does not take a value"); sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi],[sim_bswap=""])dnl
-AC_SUBST(sim_bswap)
-
-
 AC_ARG_ENABLE(sim-cflags,
 [AS_HELP_STRING([--enable-sim-cflags=opts],
 		[Extra CFLAGS for use in building simulator])],
diff --git a/sim/common/configure b/sim/common/configure
index 3ab1c63..6f2e492 100755
--- a/sim/common/configure
+++ b/sim/common/configure
@@ -610,7 +610,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -753,7 +752,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1397,7 +1395,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -10785,7 +10782,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10788 "configure"
+#line 10785 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10891,7 +10888,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10894 "configure"
+#line 10891 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11159,22 +11156,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h
index 4dfc723..4bfcdc9 100644
--- a/sim/common/sim-config.h
+++ b/sim/common/sim-config.h
@@ -40,13 +40,7 @@
 # define HOST_BYTE_ORDER BFD_ENDIAN_LITTLE
 #endif
 
-#if (defined (__i486__) || defined (__i586__) || defined (__i686__)) && defined(__GNUC__) && WITH_BSWAP
-#undef  htonl
-#undef  ntohl
-#define htonl(IN) __extension__ ({ int _out; __asm__ ("bswap %0" : "=r" (_out) : "0" (IN)); _out; })
-#define ntohl(IN) __extension__ ({ int _out; __asm__ ("bswap %0" : "=r" (_out) : "0" (IN)); _out; })
-#endif
-
+
 /* Until devices and tree properties are sorted out, tell sim-config.c
    not to call the tree_find_foo fns.  */
 #define WITH_TREE_PROPERTIES 0
@@ -86,16 +80,6 @@ extern enum bfd_endian current_target_byte_order;
 
 
 
-/* Intel host BSWAP support:
-
-   Whether to use bswap on the 486 and pentiums rather than the 386
-   sequence that uses xchgb/rorl/xchgb */
-#ifndef WITH_BSWAP
-#define	WITH_BSWAP 0
-#endif
-
-
-
 /* SMP support:
 
    Sets a limit on the number of processors that can be simulated.  If
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index dc56bb4..dedaa6d 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/cr16/configure b/sim/cr16/configure
index cd771d9..ae62ac3 100755
--- a/sim/cr16/configure
+++ b/sim/cr16/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1403,7 +1401,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12531,7 +12528,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12534 "configure"
+#line 12531 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12637,7 +12634,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12640 "configure"
+#line 12637 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12905,22 +12902,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 7f8ea85..e51ce98 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-if.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/cris/configure b/sim/cris/configure
index 5c0265e..7aa81f0 100755
--- a/sim/cris/configure
+++ b/sim/cris/configure
@@ -612,7 +612,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -755,7 +754,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1410,7 +1408,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12545,7 +12542,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12548 "configure"
+#line 12545 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12651,7 +12648,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12654 "configure"
+#line 12651 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12919,22 +12916,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/d10v/configure b/sim/d10v/configure
index d7445d3..ac97233 100755
--- a/sim/d10v/configure
+++ b/sim/d10v/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1403,7 +1401,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12531,7 +12528,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12534 "configure"
+#line 12531 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12637,7 +12634,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12640 "configure"
+#line 12637 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12905,22 +12902,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 17267f4..37620f9 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interf.c (sim_open): Replace while loop with a call to countargv.
diff --git a/sim/erc32/configure b/sim/erc32/configure
index dbd35d6..098c3cf 100755
--- a/sim/erc32/configure
+++ b/sim/erc32/configure
@@ -611,7 +611,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -754,7 +753,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1398,7 +1396,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12511,7 +12508,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12514 "configure"
+#line 12511 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12617,7 +12614,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12620 "configure"
+#line 12617 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12885,22 +12882,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index 0be8512..ac9b3fb 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-if.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/frv/configure b/sim/frv/configure
index aa22f52..82bd09f 100755
--- a/sim/frv/configure
+++ b/sim/frv/configure
@@ -613,7 +613,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -756,7 +755,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1408,7 +1406,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12537,7 +12534,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12540 "configure"
+#line 12537 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12643,7 +12640,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12646 "configure"
+#line 12643 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12911,22 +12908,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index 03235f5..a08f804 100644
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/ft32/configure b/sim/ft32/configure
index ee03fe5..6ce4ef4 100755
--- a/sim/ft32/configure
+++ b/sim/ft32/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1403,7 +1401,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12531,7 +12528,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12534 "configure"
+#line 12531 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12637,7 +12634,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12640 "configure"
+#line 12637 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12905,22 +12902,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 1af2d8a..727c514 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* compile.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/h8300/configure b/sim/h8300/configure
index 728d17e..4865f20 100755
--- a/sim/h8300/configure
+++ b/sim/h8300/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1398,7 +1396,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12516,7 +12513,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12519 "configure"
+#line 12516 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12622,7 +12619,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12625 "configure"
+#line 12622 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12890,22 +12887,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/igen/ChangeLog b/sim/igen/ChangeLog
index 6b126e5..15137f1 100644
--- a/sim/igen/ChangeLog
+++ b/sim/igen/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2015-06-12  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/igen/configure b/sim/igen/configure
index 9529c58..92c5200 100755
--- a/sim/igen/configure
+++ b/sim/igen/configure
@@ -638,7 +638,6 @@ sim_hw_cflags
 sim_default_model
 sim_scache
 sim_float
-sim_hostendian
 sim_endian
 sim_bitsize
 sim_assert
@@ -3725,10 +3724,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-
-
-
 sim_inline="-DDEFAULT_INLINE=0"
 
 
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 68bb2fd..bcbe6fc 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-if.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index 86ffedb..fba8dc1 100755
--- a/sim/iq2000/configure
+++ b/sim/iq2000/configure
@@ -612,7 +612,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -755,7 +754,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1407,7 +1405,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12537,7 +12534,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12540 "configure"
+#line 12537 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12643,7 +12640,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12646 "configure"
+#line 12643 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12911,22 +12908,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index a25d28b..8333d45 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-if.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/lm32/configure b/sim/lm32/configure
index d16cf9a..c392d23 100755
--- a/sim/lm32/configure
+++ b/sim/lm32/configure
@@ -612,7 +612,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -755,7 +754,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1406,7 +1404,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12534,7 +12531,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12537 "configure"
+#line 12534 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12640,7 +12637,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12643 "configure"
+#line 12640 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12908,22 +12905,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index 1ae19ac..1d132dc 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/m32c/configure b/sim/m32c/configure
index 0e43ba5..e20c88d 100755
--- a/sim/m32c/configure
+++ b/sim/m32c/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1399,7 +1397,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12517,7 +12514,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12520 "configure"
+#line 12517 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12623,7 +12620,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12626 "configure"
+#line 12623 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12891,22 +12888,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 7723cb9..f30b9e5 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-if.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 734675a..b4a1bd6 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -614,7 +614,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -757,7 +756,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1409,7 +1407,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12539,7 +12536,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12542 "configure"
+#line 12539 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12645,7 +12642,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12648 "configure"
+#line 12645 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12913,22 +12910,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index fbf142b..e7020d9 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index 7430917..667b901 100755
--- a/sim/m68hc11/configure
+++ b/sim/m68hc11/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1403,7 +1401,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12530,7 +12527,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12533 "configure"
+#line 12530 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12636,7 +12633,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12639 "configure"
+#line 12636 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12904,22 +12901,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index 05b9d45..bc2cb31 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/mcore/configure b/sim/mcore/configure
index d7445d3..ac97233 100755
--- a/sim/mcore/configure
+++ b/sim/mcore/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1403,7 +1401,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12531,7 +12528,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12534 "configure"
+#line 12531 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12637,7 +12634,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12640 "configure"
+#line 12637 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12905,22 +12902,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 783048d..f8845b7 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/microblaze/configure b/sim/microblaze/configure
index d7445d3..ac97233 100755
--- a/sim/microblaze/configure
+++ b/sim/microblaze/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1403,7 +1401,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12531,7 +12528,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12534 "configure"
+#line 12531 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12637,7 +12634,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12640 "configure"
+#line 12637 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12905,22 +12902,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index f8ec3e7..aee39b3 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/mips/configure b/sim/mips/configure
index 879b1e5..51fd7f6 100755
--- a/sim/mips/configure
+++ b/sim/mips/configure
@@ -622,7 +622,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -765,7 +764,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1426,7 +1424,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12563,7 +12560,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12566 "configure"
+#line 12563 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12669,7 +12666,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12672 "configure"
+#line 12669 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12937,22 +12934,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 4311aa5..65ec3ae 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index 1f1aab1..d34446a 100755
--- a/sim/mn10300/configure
+++ b/sim/mn10300/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1405,7 +1403,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12536,7 +12533,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12539 "configure"
+#line 12536 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12642,7 +12639,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12645 "configure"
+#line 12642 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12910,22 +12907,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 18ad7b2..e556c90 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/moxie/configure b/sim/moxie/configure
index 112be45..1ee1887 100755
--- a/sim/moxie/configure
+++ b/sim/moxie/configure
@@ -610,7 +610,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -753,7 +752,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1404,7 +1402,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12532,7 +12529,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12535 "configure"
+#line 12532 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12638,7 +12635,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12641 "configure"
+#line 12638 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12906,22 +12903,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index 73d89c3..fea5ce8 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/msp430/configure b/sim/msp430/configure
index e083fed..8e5d572 100755
--- a/sim/msp430/configure
+++ b/sim/msp430/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1402,7 +1400,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12527,7 +12524,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12530 "configure"
+#line 12527 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12633,7 +12630,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12636 "configure"
+#line 12633 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12901,22 +12898,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 82fd50b..b5d1dd8 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,14 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (sim-bswap): Delete.
+	* configure: Regenerate.
+	* INSTALL: Delete --enable-sim-bswap docs.
+	* Makefile.in (BSWAP_CFLAGS): Delete.
+	(CONFIG_CFLAGS): Delete $(BSWAP_CFLAGS).
+	* options.c (print_options): Delete WITH_BSWAP.
+	* sim-endian.h (htonl, ntohl): Delete.
+	* std-config.h (WITH_BSWAP): Delete.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* main.c (main): Pass SIM_OPEN_STANDALONE to psim_options and
diff --git a/sim/ppc/INSTALL b/sim/ppc/INSTALL
index da288f1..8240ac7 100644
--- a/sim/ppc/INSTALL
+++ b/sim/ppc/INSTALL
@@ -480,22 +480,6 @@ with:
 
 
 
---enable-sim-bswap
-
-
-(x86 specific) Use the i486/P5/P6 byte swap instruction.
-
-PSIM contains generic byte swapping code.  For the x86 (P[4-6]) PSIM
-can be built so that it uses the bswap instruction instead of relying
-on the compiler to generate byte swap code.
-
-Ex: default
-
-By default, when compiling with GCC-2 on an i486/P5/P6 the bswap
-instruction is used.
-
-
-
 --enable-sim-endian=endian
 
 
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 5f68909..6efa73f 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -72,7 +72,6 @@ RANLIB = @RANLIB@
 
 SIM_CFLAGS = @sim_cflags@
 INLINE_CFLAGS = @sim_inline@
-BSWAP_CFLAGS = @sim_bswap@
 ENDIAN_CFLAGS = @sim_endian@
 REGPARM_CFLAGS = @sim_regparm@
 STDCALL_CFLAGS = @sim_stdcall@
@@ -94,7 +93,7 @@ STDIO_CFLAGS = @sim_stdio@
 TERMIO_CFLAGS = @sim_termio@
 WARNING_CFLAGS = @sim_warnings@
 DEVZERO_CFLAGS = @sim_devzero@
-CONFIG_CFLAGS = $(BSWAP_CFLAGS) \
+CONFIG_CFLAGS = \
   $(ENDIAN_CFLAGS) \
   $(REGPARM_CFLAGS) \
   $(STDCALL_CFLAGS) \
diff --git a/sim/ppc/configure b/sim/ppc/configure
index 1298d38..63f1395 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -605,7 +605,7 @@ sim_timebase
 sim_env
 sim_hostbitsize
 sim_igen_smp
-sim_bswap
+sim_hostendian
 sim_pk_obj
 sim_pk_src
 sim_hw_obj
@@ -684,7 +684,6 @@ sim_hw_cflags
 sim_default_model
 sim_scache
 sim_float
-sim_hostendian
 sim_endian
 sim_bitsize
 sim_assert
@@ -734,7 +733,6 @@ enable_option_checking
 enable_sim_alignment
 enable_sim_assert
 enable_sim_bitsize
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_config
 enable_sim_decode_mechanism
@@ -1401,7 +1399,6 @@ Optional Features:
   --enable-sim-alignment=align		Specify strict or nonstrict alignment.
   --enable-sim-assert			Specify whether to perform random assertions.
   --enable-sim-bitsize=n		Specify target bitsize (32 or 64).
-  --enable-sim-bswap			Use the BSWAP instruction on Intel 486s and Pentiums.
   --enable-sim-cflags=opts		Extra CFLAGS for use in building simulator
   --enable-sim-config=file		Override default config file
   --enable-sim-decode-mechanism=which		Specify the instruction decode mechanism.
@@ -4068,10 +4065,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
-
-
-
 sim_inline="-DDEFAULT_INLINE=0"
 
 
@@ -5238,21 +5231,6 @@ else
 fi
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
@@ -7943,7 +7921,6 @@ fi
 
 
 
-
 ac_config_files="$ac_config_files Makefile"
 
 ac_config_commands="$ac_config_commands default"
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index f1a7e06..dff48d2 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -56,18 +56,6 @@ if test x"$silent" != x"yes" && test x"$sim_bitsize" != x""; then
 fi],[sim_bitsize=""])dnl
 
 
-AC_ARG_ENABLE(sim-bswap,
-[  --enable-sim-bswap			Use the BSWAP instruction on Intel 486s and Pentiums.],
-[case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	AC_MSG_ERROR("--enable-sim-bswap does not take a value"); sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi],[sim_bswap=""])dnl
-
-
 AC_ARG_ENABLE(sim-cflags,
 [  --enable-sim-cflags=opts		Extra CFLAGS for use in building simulator],
 [case "${enableval}" in
@@ -902,7 +890,6 @@ AC_SUBST(sim_hw_obj)
 AC_SUBST(sim_pk_src)
 AC_SUBST(sim_pk_obj)
 AC_SUBST(sim_inline)
-AC_SUBST(sim_bswap)
 AC_SUBST(sim_endian)
 AC_SUBST(sim_regparm)
 AC_SUBST(sim_stdcall)
diff --git a/sim/ppc/options.c b/sim/ppc/options.c
index f855c7b..b8f9f9c 100644
--- a/sim/ppc/options.c
+++ b/sim/ppc/options.c
@@ -120,7 +120,6 @@ print_options (void)
   printf_filtered ("WITH_HOST_BYTE_ORDER     = %s\n", options_byte_order (WITH_HOST_BYTE_ORDER));
   printf_filtered ("WITH_TARGET_BYTE_ORDER   = %s\n", options_byte_order (WITH_TARGET_BYTE_ORDER));
   printf_filtered ("WITH_XOR_ENDIAN          = %d\n", WITH_XOR_ENDIAN);
-  printf_filtered ("WITH_BSWAP               = %d\n", WITH_BSWAP);
   printf_filtered ("WITH_SMP                 = %d\n", WITH_SMP);
   printf_filtered ("WITH_HOST_WORD_BITSIZE   = %d\n", WITH_HOST_WORD_BITSIZE);
   printf_filtered ("WITH_TARGET_WORD_BITSIZE = %d\n", WITH_TARGET_WORD_BITSIZE);
diff --git a/sim/ppc/sim-endian.h b/sim/ppc/sim-endian.h
index c6df0f2..9a87333 100644
--- a/sim/ppc/sim-endian.h
+++ b/sim/ppc/sim-endian.h
@@ -154,13 +154,6 @@ INLINE_PSIM_ENDIAN(unsigned_8) endian_le2h_8(unsigned_8 x);
 # endif
 #endif
 
-#if (defined (__i486__) || defined (__i586__) || defined (__i686__)) && defined(__GNUC__) && WITH_BSWAP
-#undef  htonl
-#undef  ntohl
-#define htonl(IN) __extension__ ({ int _out; __asm__ ("bswap %0" : "=r" (_out) : "0" (IN)); _out; })
-#define ntohl(IN) __extension__ ({ int _out; __asm__ ("bswap %0" : "=r" (_out) : "0" (IN)); _out; })
-#endif
-
 /* Power or PowerPC running AIX  */
 #if defined(_POWER) && defined(_AIX)
 # if (WITH_HOST_BYTE_ORDER == 0)
diff --git a/sim/ppc/std-config.h b/sim/ppc/std-config.h
index 3b6b943..04ba654 100644
--- a/sim/ppc/std-config.h
+++ b/sim/ppc/std-config.h
@@ -59,15 +59,6 @@ extern int current_target_byte_order;
 #endif
 
 
-/* Intel host BSWAP support:
-
-   Whether to use bswap on the 486 and pentiums rather than the 386
-   sequence that uses xchgb/rorl/xchgb */
-#ifndef WITH_BSWAP
-#define	WITH_BSWAP 0
-#endif
-
-
 /* SMP support:
 
    Sets a limit on the number of processors that can be simulated.  If
diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index 2c3f127..3f9bf4e 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/rl78/configure b/sim/rl78/configure
index e915e85..d85339a 100755
--- a/sim/rl78/configure
+++ b/sim/rl78/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1396,7 +1394,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12509,7 +12506,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12512 "configure"
+#line 12509 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12615,7 +12612,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12618 "configure"
+#line 12615 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12883,22 +12880,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index 2ecc4bc..5460ccb 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/rx/configure b/sim/rx/configure
index 21e4f949..7c4a02b 100755
--- a/sim/rx/configure
+++ b/sim/rx/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1398,7 +1396,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12514,7 +12511,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12517 "configure"
+#line 12514 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12620,7 +12617,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12623 "configure"
+#line 12620 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12888,22 +12885,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index b9641d4..b24b906 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/sh/configure b/sim/sh/configure
index d7445d3..ac97233 100755
--- a/sim/sh/configure
+++ b/sim/sh/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1403,7 +1401,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12531,7 +12528,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12534 "configure"
+#line 12531 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12637,7 +12634,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12640 "configure"
+#line 12637 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12905,22 +12902,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index 0ca9814..07c76f8 100644
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-if.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/sh64/configure b/sim/sh64/configure
index b65e548..6516f31 100755
--- a/sim/sh64/configure
+++ b/sim/sh64/configure
@@ -612,7 +612,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -755,7 +754,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1407,7 +1405,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12537,7 +12534,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12540 "configure"
+#line 12537 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12643,7 +12640,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12646 "configure"
+#line 12643 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12911,22 +12908,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index 96ae98a..37b29e8 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure: Regenerate.
+
 2016-01-03  Mike Frysinger  <vapier@gentoo.org>
 
 	* interp.c (sim_open): Update sim_parse_args comment.
diff --git a/sim/v850/configure b/sim/v850/configure
index b7b9578..94600a6 100755
--- a/sim/v850/configure
+++ b/sim/v850/configure
@@ -609,7 +609,6 @@ sim_trace
 sim_stdio
 sim_debug
 sim_cflags
-sim_bswap
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -752,7 +751,6 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_maintainer_mode
-enable_sim_bswap
 enable_sim_cflags
 enable_sim_debug
 enable_sim_stdio
@@ -1403,7 +1401,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
-  --enable-sim-bswap      Use Host specific BSWAP instruction
   --enable-sim-cflags=opts
                           Extra CFLAGS for use in building simulator
   --enable-sim-debug=opts Enable debugging flags (for developers of the sim
@@ -12530,7 +12527,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12533 "configure"
+#line 12530 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12636,7 +12633,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12639 "configure"
+#line 12636 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12904,22 +12901,6 @@ fi
 
 
 
-# Check whether --enable-sim-bswap was given.
-if test "${enable_sim_bswap+set}" = set; then :
-  enableval=$enable_sim_bswap; case "${enableval}" in
-  yes)	sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";;
-  no)	sim_bswap="-DWITH_BSWAP=0";;
-  *)	as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then
-  echo "Setting bswap flags = $sim_bswap" 6>&1
-fi
-else
-  sim_bswap=""
-fi
-
-
-
 # Check whether --enable-sim-cflags was given.
 if test "${enable_sim_cflags+set}" = set; then :
   enableval=$enable_sim_cflags; case "${enableval}" in