diff mbox

sim: drop host endian configure option [committed]

Message ID 1451800587-10402-1-git-send-email-vapier@gentoo.org
State Committed
Headers show

Commit Message

Mike Frysinger Jan. 3, 2016, 5:56 a.m. UTC
The --enable-sim-hostendian flag was purely so people had an escape route
for when cross-compiling.  This is because historically, AC_C_BIGENDIAN
did not work in those cases.  That was fixed a while ago though, so we can
require that macro everywhere now and simplify a good bit of code.
---
 sim/aarch64/ChangeLog       |   5 +
 sim/aarch64/configure       | 487 +++++++++++++++++++++-----------------------
 sim/aarch64/configure.ac    |   1 -
 sim/arm/ChangeLog           |   5 +
 sim/arm/configure           | 487 +++++++++++++++++++++-----------------------
 sim/arm/configure.ac        |   1 -
 sim/avr/ChangeLog           |   5 +
 sim/avr/configure           | 487 +++++++++++++++++++++-----------------------
 sim/avr/configure.ac        |   1 -
 sim/bfin/ChangeLog          |   5 +
 sim/bfin/configure          | 487 +++++++++++++++++++++-----------------------
 sim/bfin/configure.ac       |   1 -
 sim/common/ChangeLog        |  28 +++
 sim/common/Make-common.in   |   2 -
 sim/common/acinclude.m4     |  32 +--
 sim/common/config.in        |  15 ++
 sim/common/configure        | 230 ++++++++++++++++++++-
 sim/common/sim-config.c     |  22 +-
 sim/common/sim-config.h     |  27 +--
 sim/common/sim-endian.c     |   8 +-
 sim/common/sim-n-core.h     |   4 +-
 sim/common/sim-n-endian.h   |  14 +-
 sim/cr16/ChangeLog          |   5 +
 sim/cr16/configure          | 487 +++++++++++++++++++++-----------------------
 sim/cr16/configure.ac       |   1 -
 sim/cris/ChangeLog          |   5 +
 sim/cris/configure          | 487 +++++++++++++++++++++-----------------------
 sim/cris/configure.ac       |   1 -
 sim/d10v/ChangeLog          |   5 +
 sim/d10v/configure          | 487 +++++++++++++++++++++-----------------------
 sim/d10v/configure.ac       |   1 -
 sim/erc32/ChangeLog         |   9 +
 sim/erc32/configure         | 487 +++++++++++++++++++++-----------------------
 sim/erc32/configure.ac      |   1 -
 sim/erc32/exec.c            |   2 +-
 sim/erc32/sis.h             |   2 +-
 sim/frv/ChangeLog           |   8 +
 sim/frv/configure           | 487 +++++++++++++++++++++-----------------------
 sim/frv/configure.ac        |   1 -
 sim/frv/frv.c               |   4 +-
 sim/ft32/ChangeLog          |   5 +
 sim/ft32/configure          | 487 +++++++++++++++++++++-----------------------
 sim/ft32/configure.ac       |   1 -
 sim/h8300/ChangeLog         |   4 +
 sim/h8300/config.in         |  15 ++
 sim/h8300/configure         | 234 ++++++++++++++++++++-
 sim/iq2000/ChangeLog        |   5 +
 sim/iq2000/configure        | 487 +++++++++++++++++++++-----------------------
 sim/iq2000/configure.ac     |   1 -
 sim/lm32/ChangeLog          |   5 +
 sim/lm32/configure          | 487 +++++++++++++++++++++-----------------------
 sim/lm32/configure.ac       |   1 -
 sim/m32c/ChangeLog          |   4 +
 sim/m32c/config.in          |  15 ++
 sim/m32c/configure          | 234 ++++++++++++++++++++-
 sim/m32r/ChangeLog          |   8 +
 sim/m32r/configure          | 487 +++++++++++++++++++++-----------------------
 sim/m32r/configure.ac       |   1 -
 sim/m32r/traps-linux.c      |   4 +-
 sim/m68hc11/ChangeLog       |   5 +
 sim/m68hc11/configure       | 487 +++++++++++++++++++++-----------------------
 sim/m68hc11/configure.ac    |   1 -
 sim/mcore/ChangeLog         |   5 +
 sim/mcore/configure         | 487 +++++++++++++++++++++-----------------------
 sim/mcore/configure.ac      |   1 -
 sim/microblaze/ChangeLog    |   5 +
 sim/microblaze/configure    | 487 +++++++++++++++++++++-----------------------
 sim/microblaze/configure.ac |   1 -
 sim/mips/ChangeLog          |   5 +
 sim/mips/configure          | 487 +++++++++++++++++++++-----------------------
 sim/mips/configure.ac       |   1 -
 sim/mn10300/ChangeLog       |   5 +
 sim/mn10300/configure       | 487 +++++++++++++++++++++-----------------------
 sim/mn10300/configure.ac    |   1 -
 sim/moxie/ChangeLog         |   5 +
 sim/moxie/configure         | 487 +++++++++++++++++++++-----------------------
 sim/moxie/configure.ac      |   1 -
 sim/msp430/ChangeLog        |   4 +
 sim/msp430/config.in        |  15 ++
 sim/msp430/configure        | 234 ++++++++++++++++++++-
 sim/rl78/ChangeLog          |   4 +
 sim/rl78/config.in          |  15 ++
 sim/rl78/configure          | 234 ++++++++++++++++++++-
 sim/rx/ChangeLog            |   4 +
 sim/rx/config.in            |  15 ++
 sim/rx/configure            | 234 ++++++++++++++++++++-
 sim/sh/ChangeLog            |   7 +
 sim/sh/configure            | 487 +++++++++++++++++++++-----------------------
 sim/sh/configure.ac         |   1 -
 sim/sh/interp.c             |   2 +-
 sim/sh64/ChangeLog          |   5 +
 sim/sh64/configure          | 487 +++++++++++++++++++++-----------------------
 sim/sh64/configure.ac       |   1 -
 sim/v850/ChangeLog          |   5 +
 sim/v850/configure          | 487 +++++++++++++++++++++-----------------------
 sim/v850/configure.ac       |   1 -
 96 files changed, 6648 insertions(+), 5871 deletions(-)
diff mbox

Patch

diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index b16bb61..24a4eb0 100644
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/aarch64/configure b/sim/aarch64/configure
index 219d770..a927ffd 100755
diff --git a/sim/aarch64/configure.ac b/sim/aarch64/configure.ac
index 7bf38dc..410131c 100644
--- a/sim/aarch64/configure.ac
+++ b/sim/aarch64/configure.ac
@@ -31,7 +31,6 @@  SIM_AC_OPTION_ENDIAN
 ## common core does not support this, so we opt for non-strict
 ## alignment instead.
 SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT,NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index f6989e9..a0b00f2 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/arm/configure b/sim/arm/configure
index 3fd5d8c..d7445d3 100755
diff --git a/sim/arm/configure.ac b/sim/arm/configure.ac
index 96d0ffd..ee83537 100644
--- a/sim/arm/configure.ac
+++ b/sim/arm/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 5fcbea1..7107554 100644
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_ENDIAN): Change LITTLE_ENDIAN to
diff --git a/sim/avr/configure b/sim/avr/configure
index 001142f..9e94d99 100755
diff --git a/sim/avr/configure.ac b/sim/avr/configure.ac
index 0857787..4527f79 100644
--- a/sim/avr/configure.ac
+++ b/sim/avr/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index 6844035..fe7f6a6 100644
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_ENDIAN): Change LITTLE_ENDIAN to
diff --git a/sim/bfin/configure b/sim/bfin/configure
index 9b8dd5d..4617cca 100755
diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac
index 5ae3b81..f0f7396 100644
--- a/sim/bfin/configure.ac
+++ b/sim/bfin/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_DEFAULT_MODEL(bf537)
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 6991786..d931834 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,31 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	(CONFIG_CFLAGS): Delte $(SIM_HOSTENDIAN).
+	* acinclude.m4 (SIM_AC_COMMON): Call AC_C_BIGENDIAN.
+	(SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* config.in, configure: Regenerate.
+	* Make-common.in (SIM_HOSTENDIAN): Delete.
+	* sim-config.c (current_host_byte_order): Delete.
+	(sim_config): Delete current_host_byte_order assignments and
+	CURRENT_HOST_BYTE_ORDER checks.
+	(print_sim_config): Change WITH_HOST_BYTE_ORDER to HOST_BYTE_ORDER.
+	* sim-config.h (WITH_HOST_BYTE_ORDER): Change to ...
+	(HOST_BYTE_ORDER): ... this.  Define based on WORDS_BIGENDIAN.
+	(current_host_byte_order): Delete.
+	(CURRENT_HOST_BYTE_ORDER): Likewise.
+	* sim-endian.c (WITH_HOST_BYTE_ORDER): Rename to ...
+	(HOST_BYTE_ORDER): ... this.
+	(sim_endian_split_16): Change WITH_HOST_BYTE_ORDER to
+	HOST_BYTE_ORDER.
+	(sim_endian_join_16): Likewise.
+	* sim-n-core.h (sim_core_read_misaligned_N): Change
+	CURRENT_HOST_BYTE_ORDER to HOST_BYTE_ORDER.
+	(sim_core_write_misaligned_N): Likewise.
+	* sim-n-endian.h (endian_t2h_N): Likewise.
+	(endian_h2t_N, endian_h2be_N, endian_be2h_N, endian_h2le_N,
+	endian_le2h_N): Likewise.
+	(offset_N): Change WITH_HOST_BYTE_ORDER to HOST_BYTE_ORDER.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* acinclude.m4 (SIM_AC_OPTION_ENDIAN): Change BIG_ENDIAN to
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 579e187..36497e7 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -91,7 +91,6 @@  SIM_FLOAT = @sim_float@
 SIM_HW_CFLAGS = @sim_hw_cflags@
 SIM_HW_OBJS = @sim_hw_objs@
 SIM_HW = @sim_hw@
-SIM_HOSTENDIAN = @sim_hostendian@
 SIM_INLINE = @sim_inline@
 SIM_PACKAGES = @sim_packages@
 SIM_REGPARM = @sim_regparm@
@@ -243,7 +242,6 @@  CONFIG_CFLAGS = \
 	$(SIM_ENVIRONMENT) \
 	$(SIM_FLOAT) \
 	$(SIM_HW_CFLAGS) \
-	$(SIM_HOSTENDIAN) \
 	$(SIM_INLINE) \
 	$(SIM_PACKAGES) \
 	$(SIM_REGPARM) \
diff --git a/sim/common/acinclude.m4 b/sim/common/acinclude.m4
index 2af6d5d..9529337 100644
--- a/sim/common/acinclude.m4
+++ b/sim/common/acinclude.m4
@@ -36,6 +36,7 @@  AC_REQUIRE([AC_PROG_CC])
 AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in)
 AC_CANONICAL_SYSTEM
 AC_USE_SYSTEM_EXTENSIONS
+AC_C_BIGENDIAN
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 
@@ -489,37 +490,6 @@  fi])dnl
 AC_SUBST(sim_endian)
 
 
-dnl --enable-sim-hostendian is for users of the simulator when
-dnl they find that AC_C_BIGENDIAN does not function correctly
-dnl (for instance in a canadian cross)
-AC_DEFUN([SIM_AC_OPTION_HOSTENDIAN],
-[
-AC_ARG_ENABLE(sim-hostendian,
-[AS_HELP_STRING([--enable-sim-hostendian=end],
-		[Specify host byte endian orientation])],
-[case "${enableval}" in
-  no)	 sim_hostendian="-DWITH_HOST_BYTE_ORDER=BFD_ENDIAN_UNKNOWN";;
-  b*|B*) sim_hostendian="-DWITH_HOST_BYTE_ORDER=BFD_ENDIAN_BIG";;
-  l*|L*) sim_hostendian="-DWITH_HOST_BYTE_ORDER=BFD_ENDIAN_LITTLE";;
-  *)	 AC_MSG_ERROR("Unknown value $enableval for --enable-sim-hostendian"); sim_hostendian="";;
-esac
-if test x"$silent" != x"yes" && test x"$sim_hostendian" != x""; then
-  echo "Setting hostendian flags = $sim_hostendian" 6>&1
-fi],[
-if test "x$cross_compiling" = "xno"; then
-  AC_C_BIGENDIAN
-  if test $ac_cv_c_bigendian = yes; then
-    sim_hostendian="-DWITH_HOST_BYTE_ORDER=BFD_ENDIAN_BIG"
-  else
-    sim_hostendian="-DWITH_HOST_BYTE_ORDER=BFD_ENDIAN_LITTLE"
-  fi
-else
-  sim_hostendian="-DWITH_HOST_BYTE_ORDER=BFD_ENDIAN_UNKNOWN"
-fi])dnl
-])
-AC_SUBST(sim_hostendian)
-
-
 dnl --enable-sim-float is for developers of the simulator
 dnl It specifies the presence of hardware floating point
 dnl And optionally the bitsize of the floating point register.
diff --git a/sim/common/config.in b/sim/common/config.in
index 4f3c89f..f24eb3b 100644
diff --git a/sim/common/configure b/sim/common/configure
index d58935d..3ab1c63 100755
diff --git a/sim/common/sim-config.c b/sim/common/sim-config.c
index 8e9b1dd..d9036e1 100644
--- a/sim/common/sim-config.c
+++ b/sim/common/sim-config.c
@@ -25,7 +25,6 @@ 
 #include "bfd.h"
 
 
-enum bfd_endian current_host_byte_order = BFD_ENDIAN_UNKNOWN;
 enum bfd_endian current_target_byte_order = BFD_ENDIAN_UNKNOWN;
 int current_stdio;
 
@@ -155,23 +154,6 @@  sim_config (SIM_DESC sd)
 				  ? BFD_ENDIAN_LITTLE
 				  : BFD_ENDIAN_BIG);
 
-  /* set the host byte order */
-  current_host_byte_order = 1;
-  if (*(char*)(&current_host_byte_order))
-    current_host_byte_order = BFD_ENDIAN_LITTLE;
-  else
-    current_host_byte_order = BFD_ENDIAN_BIG;
-
-  /* verify the host byte order */
-  if (CURRENT_HOST_BYTE_ORDER != current_host_byte_order)
-    {
-      sim_io_eprintf (sd, "host (%s) and configured (%s) byte order in conflict",
-		      config_byte_order_to_a (current_host_byte_order),
-		      config_byte_order_to_a (CURRENT_HOST_BYTE_ORDER));
-      return SIM_RC_FAIL;
-    }
-
-
   /* set the target byte order */
 #if (WITH_TREE_PROPERTIES)
   if (current_target_byte_order == BFD_ENDIAN_UNKNOWN)
@@ -326,8 +308,8 @@  print_sim_config (SIM_DESC sd)
   sim_io_printf (sd, "WITH_DEFAULT_TARGET_BYTE_ORDER   = %s\n",
 		 config_byte_order_to_a (WITH_DEFAULT_TARGET_BYTE_ORDER));
 
-  sim_io_printf (sd, "WITH_HOST_BYTE_ORDER     = %s\n",
-		 config_byte_order_to_a (WITH_HOST_BYTE_ORDER));
+  sim_io_printf (sd, "HOST_BYTE_ORDER          = %s\n",
+		 config_byte_order_to_a (HOST_BYTE_ORDER));
 
   sim_io_printf (sd, "WITH_STDIO               = %s\n",
 		 config_stdio_to_a (WITH_STDIO));
diff --git a/sim/common/sim-config.h b/sim/common/sim-config.h
index fbd9b25..4dfc723 100644
--- a/sim/common/sim-config.h
+++ b/sim/common/sim-config.h
@@ -29,13 +29,16 @@ 
    The CPP below defines information about the compilation host.  In
    particular it defines the macro's:
 
-   	WITH_HOST_BYTE_ORDER	The byte order of the host. Could
-				be any of BFD_ENDIAN_LITTLE, BFD_ENDIAN_BIG,
-				or BFD_ENDIAN_UNKNOWN.  Those macro's also
-				need to be defined.
+   HOST_BYTE_ORDER	The byte order of the host. Could be BFD_ENDIAN_LITTLE
+			or BFD_ENDIAN_BIG.
 
  */
 
+#ifdef WORDS_BIGENDIAN
+# define HOST_BYTE_ORDER BFD_ENDIAN_BIG
+#else
+# define HOST_BYTE_ORDER BFD_ENDIAN_LITTLE
+#endif
 
 #if (defined (__i486__) || defined (__i586__) || defined (__i686__)) && defined(__GNUC__) && WITH_BSWAP
 #undef  htonl
@@ -49,17 +52,9 @@ 
 #define WITH_TREE_PROPERTIES 0
 
 
-/* endianness of the host/target:
-
-   If the build process is aware (at compile time) of the endianness
-   of the host/target it is able to eliminate slower generic endian
-   handling code.
+/* Endianness of the target.
 
-   Possible values are BFD_ENDIAN_UNKNOWN, BFD_ENDIAN_LITTLE, BFD_ENDIAN_BIG.  */
-
-#ifndef WITH_HOST_BYTE_ORDER
-#define WITH_HOST_BYTE_ORDER		BFD_ENDIAN_UNKNOWN
-#endif
+   Possible values are BFD_ENDIAN_UNKNOWN, BFD_ENDIAN_LITTLE, or BFD_ENDIAN_BIG.  */
 
 #ifndef WITH_TARGET_BYTE_ORDER
 #define WITH_TARGET_BYTE_ORDER		BFD_ENDIAN_UNKNOWN
@@ -69,10 +64,6 @@ 
 #define WITH_DEFAULT_TARGET_BYTE_ORDER	BFD_ENDIAN_UNKNOWN
 #endif
 
-extern enum bfd_endian current_host_byte_order;
-#define CURRENT_HOST_BYTE_ORDER \
-  (WITH_HOST_BYTE_ORDER != BFD_ENDIAN_UNKNOWN \
-   ? WITH_HOST_BYTE_ORDER : current_host_byte_order)
 extern enum bfd_endian current_target_byte_order;
 #define CURRENT_TARGET_BYTE_ORDER \
   (WITH_TARGET_BYTE_ORDER != BFD_ENDIAN_UNKNOWN \
diff --git a/sim/common/sim-endian.c b/sim/common/sim-endian.c
index e8ef534..884b8b7 100644
--- a/sim/common/sim-endian.c
+++ b/sim/common/sim-endian.c
@@ -31,7 +31,7 @@ 
 #define _SWAP_1(SET,RAW) SET (RAW)
 #endif
 
-#if !defined(_SWAP_2) && (WITH_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) && defined(htons)
+#if !defined(_SWAP_2) && (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) && defined(htons)
 #define _SWAP_2(SET,RAW) SET htons (RAW)
 #endif
 
@@ -39,7 +39,7 @@ 
 #define _SWAP_2(SET,RAW) SET (((RAW) >> 8) | ((RAW) << 8))
 #endif
 
-#if !defined(_SWAP_4) && (WITH_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) && defined(htonl)
+#if !defined(_SWAP_4) && (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) && defined(htonl)
 #define _SWAP_4(SET,RAW) SET htonl (RAW)
 #endif
 
@@ -93,7 +93,7 @@  INLINE_SIM_ENDIAN\
 (unsigned_8)
 sim_endian_split_16 (unsigned_16 word, int w)
 {
-  if (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
     {
       return word.a[1 - w];
     }
@@ -110,7 +110,7 @@  sim_endian_join_16 (unsigned_8 h, unsigned_8 l)
 
 {
   unsigned_16 word;
-  if (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
     {
       word.a[0] = l;
       word.a[1] = h;
diff --git a/sim/common/sim-n-core.h b/sim/common/sim-n-core.h
index 0c1cb7a..30611c7 100644
--- a/sim/common/sim-n-core.h
+++ b/sim/common/sim-n-core.h
@@ -248,7 +248,7 @@  sim_core_read_misaligned_N(sim_cpu *cpu,
   if (sim_core_xor_read_buffer (CPU_STATE (cpu), cpu, map, &val, addr, N) != N)
     SIM_CORE_SIGNAL (CPU_STATE (cpu), cpu, cia, map, N, addr,
 		     read_transfer, sim_core_unaligned_signal);
-  if (CURRENT_HOST_BYTE_ORDER != CURRENT_TARGET_BYTE_ORDER)
+  if (HOST_BYTE_ORDER != CURRENT_TARGET_BYTE_ORDER)
     val = SWAP_M (val);
   if (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
     val >>= (M - N) * 8;
@@ -368,7 +368,7 @@  sim_core_write_misaligned_N(sim_cpu *cpu,
   unsigned_M data = val;
   if (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
     data <<= (M - N) * 8;
-  if (CURRENT_HOST_BYTE_ORDER != CURRENT_TARGET_BYTE_ORDER)
+  if (HOST_BYTE_ORDER != CURRENT_TARGET_BYTE_ORDER)
     data = SWAP_M (data);
   if (sim_core_xor_write_buffer (CPU_STATE (cpu), cpu, map, &data, addr, N) != N)
     SIM_CORE_SIGNAL (CPU_STATE (cpu), cpu, cia, map, N, addr,
diff --git a/sim/common/sim-n-endian.h b/sim/common/sim-n-endian.h
index ef7d2ce..a0f8d2f 100644
--- a/sim/common/sim-n-endian.h
+++ b/sim/common/sim-n-endian.h
@@ -44,7 +44,7 @@  INLINE_SIM_ENDIAN\
 (unsigned_N)
 endian_t2h_N(unsigned_N raw_in)
 {
-  if (CURRENT_TARGET_BYTE_ORDER == CURRENT_HOST_BYTE_ORDER) {
+  if (CURRENT_TARGET_BYTE_ORDER == HOST_BYTE_ORDER) {
     return raw_in;
   }
   else {
@@ -58,7 +58,7 @@  INLINE_SIM_ENDIAN\
 (unsigned_N)
 endian_h2t_N(unsigned_N raw_in)
 {
-  if (CURRENT_TARGET_BYTE_ORDER == CURRENT_HOST_BYTE_ORDER) {
+  if (CURRENT_TARGET_BYTE_ORDER == HOST_BYTE_ORDER) {
     return raw_in;
   }
   else {
@@ -81,7 +81,7 @@  INLINE_SIM_ENDIAN\
 (unsigned_N)
 endian_h2be_N(unsigned_N raw_in)
 {
-  if (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_BIG) {
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_BIG) {
     return raw_in;
   }
   else {
@@ -95,7 +95,7 @@  INLINE_SIM_ENDIAN\
 (unsigned_N)
 endian_be2h_N(unsigned_N raw_in)
 {
-  if (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_BIG) {
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_BIG) {
     return raw_in;
   }
   else {
@@ -109,7 +109,7 @@  INLINE_SIM_ENDIAN\
 (unsigned_N)
 endian_h2le_N(unsigned_N raw_in)
 {
-  if (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) {
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) {
     return raw_in;
   }
   else {
@@ -123,7 +123,7 @@  INLINE_SIM_ENDIAN\
 (unsigned_N)
 endian_le2h_N(unsigned_N raw_in)
 {
-  if (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) {
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE) {
     return raw_in;
   }
   else {
@@ -145,7 +145,7 @@  offset_N (unsigned_N *x,
   ASSERT (offset + sizeof_word <= sizeof(unsigned_N));
   ASSERT (word < (sizeof (unsigned_N) / sizeof_word));
   ASSERT ((sizeof (unsigned_N) % sizeof_word) == 0);
-  if (WITH_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
     {
       out = in + sizeof (unsigned_N) - offset - sizeof_word;
     }
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 130e878..1e4e737 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_ENDIAN): Change LITTLE_ENDIAN to
diff --git a/sim/cr16/configure b/sim/cr16/configure
index c538ede..cd771d9 100755
diff --git a/sim/cr16/configure.ac b/sim/cr16/configure.ac
index 7464e34..c3cc966 100644
--- a/sim/cr16/configure.ac
+++ b/sim/cr16/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog
index 79ce999..79431b0 100644
--- a/sim/cris/ChangeLog
+++ b/sim/cris/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* arch.h (TARGET_BIG_ENDIAN): Delete.
diff --git a/sim/cris/configure b/sim/cris/configure
index 9914337..5c0265e 100755
diff --git a/sim/cris/configure.ac b/sim/cris/configure.ac
index 5b384a2..ee8a08d 100644
--- a/sim/cris/configure.ac
+++ b/sim/cris/configure.ac
@@ -10,7 +10,6 @@  AC_CHECK_HEADERS(sys/socket.h sys/select.h limits.h sys/param.h)
 
 SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_WARNINGS
 SIM_AC_OPTION_HARDWARE(yes,,rv cris cris_900000xx)
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 1a2f94f..e745678 100644
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/d10v/configure b/sim/d10v/configure
index 3fd5d8c..d7445d3 100755
diff --git a/sim/d10v/configure.ac b/sim/d10v/configure.ac
index 96d0ffd..ee83537 100644
--- a/sim/d10v/configure.ac
+++ b/sim/d10v/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index fd23fe6..d47549a 100644
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,12 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+	* exec.c (fpexec): Rename CURRENT_HOST_BYTE_ORDER to
+	HOST_BYTE_ORDER.
+	* sis.h (WITH_HOST_BYTE_ORDER): Rename to ...
+	(HOST_BYTE_ORDER): ... this.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/erc32/configure b/sim/erc32/configure
index d12525b..dbd35d6 100755
diff --git a/sim/erc32/configure.ac b/sim/erc32/configure.ac
index 42c30d3..c182633 100644
--- a/sim/erc32/configure.ac
+++ b/sim/erc32/configure.ac
@@ -45,5 +45,4 @@  else
 	       AC_ERROR([the required "readline" library is missing]), $TERMCAP)
 fi
 AC_SUBST(READLINE)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OUTPUT
diff --git a/sim/erc32/exec.c b/sim/erc32/exec.c
index ef49e20..a0ab0f9 100644
--- a/sim/erc32/exec.c
+++ b/sim/erc32/exec.c
@@ -1728,7 +1728,7 @@  fpexec(op3, rd, rs1, rs2, sregs)
     /* SPARC is big-endian - swap double floats if host is little-endian */
     /* This is ugly - I know ... */
 
-    /* FIXME: should use (CURRENT_HOST_BYTE_ORDER == CURRENT_TARGET_BYTE_ORDER)
+    /* FIXME: should use (HOST_BYTE_ORDER == CURRENT_TARGET_BYTE_ORDER)
        but what about machines where float values are different endianness
        from integer values? */
 
diff --git a/sim/erc32/sis.h b/sim/erc32/sis.h
index a3518c1..5a909f5 100644
--- a/sim/erc32/sis.h
+++ b/sim/erc32/sis.h
@@ -20,7 +20,7 @@ 
 #include <sim-config.h>
 #include <stdint.h>
 
-#if WITH_HOST_BYTE_ORDER == BIG_ENDIAN
+#if HOST_BYTE_ORDER == BIG_ENDIAN
 #define HOST_BIG_ENDIAN
 #define EBT 0
 #else
diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog
index dd28834..05283b8 100644
--- a/sim/frv/ChangeLog
+++ b/sim/frv/ChangeLog
@@ -1,3 +1,11 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+	* frv.c (frvbf_h_fr_double_get_handler): Change
+	CURRENT_HOST_BYTE_ORDER to HOST_BYTE_ORDER.
+	(frvbf_h_fr_double_set_handler): Likewise.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* arch.h (TARGET_BIG_ENDIAN): Delete.
diff --git a/sim/frv/configure b/sim/frv/configure
index 40b8bdf..aa22f52 100755
diff --git a/sim/frv/configure.ac b/sim/frv/configure.ac
index ad73eed..bb5f459 100644
--- a/sim/frv/configure.ac
+++ b/sim/frv/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(BIG)
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(fr500)
 SIM_AC_OPTION_ENVIRONMENT
diff --git a/sim/frv/frv.c b/sim/frv/frv.c
index 594931f..a9dbac9 100644
--- a/sim/frv/frv.c
+++ b/sim/frv/frv.c
@@ -303,7 +303,7 @@  frvbf_h_fr_double_get_handler (SIM_CPU *current_cpu, UINT fr)
   /* Check the register alignment.  */
   fr = check_fr_register_alignment (current_cpu, fr, 1);
 
-  if (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
     {
       value.as_sf[1] = GET_H_FR (fr);
       value.as_sf[0] = GET_H_FR (fr + 1);
@@ -329,7 +329,7 @@  frvbf_h_fr_double_set_handler (SIM_CPU *current_cpu, UINT fr, DF newval)
   fr = check_fr_register_alignment (current_cpu, fr, 1);
 
   value.as_df = newval;
-  if (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
     {
       SET_H_FR (fr    , value.as_sf[1]);
       SET_H_FR (fr + 1, value.as_sf[0]);
diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index 3f30164..3a1accc 100644
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_ENDIAN): Change LITTLE_ENDIAN to
diff --git a/sim/ft32/configure b/sim/ft32/configure
index a12de76..ee03fe5 100755
diff --git a/sim/ft32/configure.ac b/sim/ft32/configure.ac
index 57573d8..7ef618b 100644
--- a/sim/ft32/configure.ac
+++ b/sim/ft32/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
diff --git a/sim/h8300/ChangeLog b/sim/h8300/ChangeLog
index 2327bb4..6291ce8 100644
--- a/sim/h8300/ChangeLog
+++ b/sim/h8300/ChangeLog
@@ -1,3 +1,7 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* config.in, configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_ENDIAN): Change BIG_ENDIAN to BIG.
diff --git a/sim/h8300/config.in b/sim/h8300/config.in
index 3abf194..b38ed02 100644
diff --git a/sim/h8300/configure b/sim/h8300/configure
index 12b72e4..728d17e 100755
diff --git a/sim/iq2000/ChangeLog b/sim/iq2000/ChangeLog
index 7fbebd5..9959f37 100644
--- a/sim/iq2000/ChangeLog
+++ b/sim/iq2000/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* arch.h (TARGET_BIG_ENDIAN): Delete.
diff --git a/sim/iq2000/configure b/sim/iq2000/configure
index 7f6b7bf..86ffedb 100755
diff --git a/sim/iq2000/configure.ac b/sim/iq2000/configure.ac
index 923ae92..f73aebc 100644
--- a/sim/iq2000/configure.ac
+++ b/sim/iq2000/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(BIG)
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(iq2000)
 SIM_AC_OPTION_ENVIRONMENT
diff --git a/sim/lm32/ChangeLog b/sim/lm32/ChangeLog
index 552e848..1729788 100644
--- a/sim/lm32/ChangeLog
+++ b/sim/lm32/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* arch.h (TARGET_BIG_ENDIAN): Delete.
diff --git a/sim/lm32/configure b/sim/lm32/configure
index 3968c92..d16cf9a 100755
diff --git a/sim/lm32/configure.ac b/sim/lm32/configure.ac
index 90f5e2b..a162f29 100644
--- a/sim/lm32/configure.ac
+++ b/sim/lm32/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(BIG)
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(lm32)
 SIM_AC_OPTION_ENVIRONMENT
diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index 19f3114..1ae19ac 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,7 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* config.in, configure: Regenerate.
+
 2015-12-26  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/m32c/config.in b/sim/m32c/config.in
index 7164bcc..950375a 100644
diff --git a/sim/m32c/configure b/sim/m32c/configure
index ac41998..0e43ba5 100755
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 7578315..7d0eaf2 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,11 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+	* traps-linux.c (conv_endian): Change CURRENT_HOST_BYTE_ORDER
+	to HOST_BYTE_ORDER.
+	(conv_endian16): Likewise.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* arch.h (TARGET_BIG_ENDIAN): Delete.
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 8742adb..734675a 100755
diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index 68fb20d..d73f21b 100644
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(BIG)
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)
 SIM_AC_OPTION_ENVIRONMENT
diff --git a/sim/m32r/traps-linux.c b/sim/m32r/traps-linux.c
index 9220451..d009b06 100644
--- a/sim/m32r/traps-linux.c
+++ b/sim/m32r/traps-linux.c
@@ -136,7 +136,7 @@  conv_endian (unsigned int tvalue)
   unsigned int hvalue;
   unsigned int t1, t2, t3, t4;
 
-  if (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
     {
       t1 = tvalue & 0xff000000;
       t2 = tvalue & 0x00ff0000;
@@ -160,7 +160,7 @@  conv_endian16 (unsigned short tvalue)
   unsigned short hvalue;
   unsigned short t1, t2;
 
-  if (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
+  if (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
     {
       t1 = tvalue & 0xff00;
       t2 = tvalue & 0x00ff;
diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index fb9c4bc..1c22b2a 100644
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_ENDIAN): Change BIG_ENDIAN to BIG.
diff --git a/sim/m68hc11/configure b/sim/m68hc11/configure
index df2d872..7430917 100755
diff --git a/sim/m68hc11/configure.ac b/sim/m68hc11/configure.ac
index aafbb31..4a0abe6 100644
--- a/sim/m68hc11/configure.ac
+++ b/sim/m68hc11/configure.ac
@@ -9,7 +9,6 @@  dnl Options available in this module
 SIM_AC_OPTION_INLINE()
 SIM_AC_OPTION_ENDIAN(BIG)
 SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_WARNINGS
 
 #
diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index ce99714..6b05983 100644
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/mcore/configure b/sim/mcore/configure
index 3fd5d8c..d7445d3 100755
diff --git a/sim/mcore/configure.ac b/sim/mcore/configure.ac
index 96d0ffd..ee83537 100644
--- a/sim/mcore/configure.ac
+++ b/sim/mcore/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index 3c21d5e..71cb6b2 100644
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/microblaze/configure b/sim/microblaze/configure
index 3fd5d8c..d7445d3 100755
diff --git a/sim/microblaze/configure.ac b/sim/microblaze/configure.ac
index 96d0ffd..ee83537 100644
--- a/sim/microblaze/configure.ac
+++ b/sim/microblaze/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index ba0a50b..47dd1b0 100644
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (mips_endian): Change LITTLE_ENDIAN to LITTLE.
diff --git a/sim/mips/configure b/sim/mips/configure
index c31d65e..879b1e5 100755
diff --git a/sim/mips/configure.ac b/sim/mips/configure.ac
index 91e7b0c..4e51e0b 100644
--- a/sim/mips/configure.ac
+++ b/sim/mips/configure.ac
@@ -8,7 +8,6 @@  SIM_AC_COMMON
 dnl Options available in this module
 SIM_AC_OPTION_INLINE()
 SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_WARNINGS
 SIM_AC_OPTION_RESERVED_BITS(1)
 
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 1d05f8d..8d23035 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_ENDIAN): Change LITTLE_ENDIAN to
diff --git a/sim/mn10300/configure b/sim/mn10300/configure
index 1fac8bf..1f1aab1 100755
diff --git a/sim/mn10300/configure.ac b/sim/mn10300/configure.ac
index 7d3c223..3297b0c 100644
--- a/sim/mn10300/configure.ac
+++ b/sim/mn10300/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_WARNINGS
 SIM_AC_OPTION_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)
diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 718e804..84b89e8 100644
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_ENDIAN): Change BIG_ENDIAN to BIG.
diff --git a/sim/moxie/configure b/sim/moxie/configure
index 6990a8f..112be45 100755
diff --git a/sim/moxie/configure.ac b/sim/moxie/configure.ac
index a7f2b82..3ce09f6 100644
--- a/sim/moxie/configure.ac
+++ b/sim/moxie/configure.ac
@@ -9,7 +9,6 @@  AC_CHECK_TOOL(DTC, dtc)
 
 SIM_AC_OPTION_ENDIAN(BIG)
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
diff --git a/sim/msp430/ChangeLog b/sim/msp430/ChangeLog
index db8269e..73d89c3 100644
--- a/sim/msp430/ChangeLog
+++ b/sim/msp430/ChangeLog
@@ -1,3 +1,7 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* config.in, configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_ENDIAN): Change LITTLE_ENDIAN to
diff --git a/sim/msp430/config.in b/sim/msp430/config.in
index a52fc2b..bbccc94 100644
diff --git a/sim/msp430/configure b/sim/msp430/configure
index 229096a..e083fed 100755
diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index 5a15461..2c3f127 100644
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,7 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* config.in, configure: Regenerate.
+
 2015-12-26  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/rl78/config.in b/sim/rl78/config.in
index a52fc2b..bbccc94 100644
diff --git a/sim/rl78/configure b/sim/rl78/configure
index 6b45e05..e915e85 100755
diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index 43c715c..2ecc4bc 100644
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,7 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* config.in, configure: Regenerate.
+
 2015-12-26  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.in, configure: Regenerate.
diff --git a/sim/rx/config.in b/sim/rx/config.in
index 236f6a4..6613874 100644
diff --git a/sim/rx/configure b/sim/rx/configure
index 4bd0e58..21e4f94 100755
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index 56e9f10..7fd3492 100644
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,10 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+	* interp.c (host_little_endian): Change CURRENT_HOST_BYTE_ORDER
+	to HOST_BYTE_ORDER.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/sh/configure b/sim/sh/configure
index 3fd5d8c..d7445d3 100755
diff --git a/sim/sh/configure.ac b/sim/sh/configure.ac
index 96d0ffd..ee83537 100644
--- a/sim/sh/configure.ac
+++ b/sim/sh/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT,STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_ENVIRONMENT
 SIM_AC_OPTION_INLINE
 SIM_AC_OPTION_WARNINGS
diff --git a/sim/sh/interp.c b/sim/sh/interp.c
index f7c4948..ee34e0d 100644
--- a/sim/sh/interp.c
+++ b/sim/sh/interp.c
@@ -119,7 +119,7 @@  struct loop_bounds { unsigned char *start, *end; };
 #define target_little_endian (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_LITTLE)
 static int global_endianw, endianb;
 static int target_dsp;
-#define host_little_endian (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
+#define host_little_endian (HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
 
 static int maskw = 0;
 static int maskl = 0;
diff --git a/sim/sh64/ChangeLog b/sim/sh64/ChangeLog
index 18a1d8a..d719c5c 100644
--- a/sim/sh64/ChangeLog
+++ b/sim/sh64/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* arch.h (TARGET_BIG_ENDIAN): Delete.
diff --git a/sim/sh64/configure b/sim/sh64/configure
index 7c3b424..b65e548 100755
diff --git a/sim/sh64/configure.ac b/sim/sh64/configure.ac
index 4da1756..c1fb783 100644
--- a/sim/sh64/configure.ac
+++ b/sim/sh64/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN([], BIG)
 SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_SCACHE(16384)
 SIM_AC_OPTION_DEFAULT_MODEL(sh5)
 SIM_AC_OPTION_ENVIRONMENT
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog
index d21492b..49b97c1 100644
--- a/sim/v850/ChangeLog
+++ b/sim/v850/ChangeLog
@@ -1,3 +1,8 @@ 
+2016-01-03  Mike Frysinger  <vapier@gentoo.org>
+
+	* configure.ac (SIM_AC_OPTION_HOSTENDIAN): Delete.
+	* configure: Regenerate.
+
 2016-01-02  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac (SIM_AC_OPTION_ENDIAN): Change LITTLE_ENDIAN to
diff --git a/sim/v850/configure b/sim/v850/configure
index c1e449a..b7b9578 100755
diff --git a/sim/v850/configure.ac b/sim/v850/configure.ac
index 0ac54e0..314b073 100644
--- a/sim/v850/configure.ac
+++ b/sim/v850/configure.ac
@@ -7,7 +7,6 @@  SIM_AC_COMMON
 
 SIM_AC_OPTION_ENDIAN(LITTLE)
 SIM_AC_OPTION_ALIGNMENT(,NONSTRICT_ALIGNMENT)
-SIM_AC_OPTION_HOSTENDIAN
 SIM_AC_OPTION_WARNINGS
 SIM_AC_OPTION_RESERVED_BITS
 SIM_AC_OPTION_BITSIZE(32,31)