aboutsummaryrefslogtreecommitdiff
path: root/sim/m32r
diff options
context:
space:
mode:
Diffstat (limited to 'sim/m32r')
-rw-r--r--sim/m32r/ChangeLog9
-rw-r--r--sim/m32r/arch.h2
-rwxr-xr-xsim/m32r/configure36
-rw-r--r--sim/m32r/configure.ac2
-rw-r--r--sim/m32r/traps-linux.c4
5 files changed, 30 insertions, 23 deletions
diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog
index 8b65bb9..7578315 100644
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,5 +1,14 @@
2016-01-02 Mike Frysinger <vapier@gentoo.org>
+ * arch.h (TARGET_BIG_ENDIAN): Delete.
+ * configure.ac (SIM_AC_OPTION_ENDIAN): Change BIG_ENDIAN to BIG.
+ * configure: Regenerate.
+ * traps-linux.c (conv_endian): Change LITTLE_ENDIAN to
+ BFD_ENDIAN_LITTLE.
+ (conv_endian16): Likewise.
+
+2016-01-02 Mike Frysinger <vapier@gentoo.org>
+
* sim-if.c (sim_open): Delete #if 0 sim_add_option_table call.
2016-01-02 Mike Frysinger <vapier@gentoo.org>
diff --git a/sim/m32r/arch.h b/sim/m32r/arch.h
index 8341c4c..93e7e2e 100644
--- a/sim/m32r/arch.h
+++ b/sim/m32r/arch.h
@@ -24,8 +24,6 @@ This file is part of the GNU simulators.
#ifndef M32R_ARCH_H
#define M32R_ARCH_H
-#define TARGET_BIG_ENDIAN 1
-
/* Enum declaration for model types. */
typedef enum model_type {
MODEL_M32R_D, MODEL_TEST, MODEL_M32RX, MODEL_M32R2
diff --git a/sim/m32r/configure b/sim/m32r/configure
index 5c263da..8742adb 100755
--- a/sim/m32r/configure
+++ b/sim/m32r/configure
@@ -12920,31 +12920,31 @@ sim_link_links="${sim_link_links} targ-vals.def"
-wire_endian="BIG_ENDIAN"
+wire_endian="BIG"
default_endian=""
# Check whether --enable-sim-endian was given.
if test "${enable_sim_endian+set}" = set; then :
enableval=$enable_sim_endian; case "${enableval}" in
- b*|B*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BIG_ENDIAN";;
- l*|L*) sim_endian="-DWITH_TARGET_BYTE_ORDER=LITTLE_ENDIAN";;
+ b*|B*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_BIG";;
+ l*|L*) sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_LITTLE";;
yes) if test x"$wire_endian" != x; then
- sim_endian="-DWITH_TARGET_BYTE_ORDER=${wire_endian}"
+ sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}"
else
- if test x"$default_endian" != x; then
- sim_endian="-DWITH_TARGET_BYTE_ORDER=${default_endian}"
+ if test x"$default_endian" != x; then
+ sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}"
else
echo "No hard-wired endian for target $target" 1>&6
- sim_endian="-DWITH_TARGET_BYTE_ORDER=0"
+ sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_UNKNOWN"
fi
fi;;
no) if test x"$default_endian" != x; then
- sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=${default_endian}"
+ sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}"
else
if test x"$wire_endian" != x; then
- sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=${wire_endian}"
+ sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}"
else
echo "No default endian for target $target" 1>&6
- sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=0"
+ sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_UNKNOWN"
fi
fi;;
*) as_fn_error "\"Unknown value $enableval for --enable-sim-endian\"" "$LINENO" 5; sim_endian="";;
@@ -12954,10 +12954,10 @@ if test x"$silent" != x"yes" && test x"$sim_endian" != x""; then
fi
else
if test x"$default_endian" != x; then
- sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=${default_endian}"
+ sim_endian="-DWITH_DEFAULT_TARGET_BYTE_ORDER=BFD_ENDIAN_${default_endian}"
else
if test x"$wire_endian" != x; then
- sim_endian="-DWITH_TARGET_BYTE_ORDER=${wire_endian}"
+ sim_endian="-DWITH_TARGET_BYTE_ORDER=BFD_ENDIAN_${wire_endian}"
else
sim_endian=
fi
@@ -13014,9 +13014,9 @@ fi
# Check whether --enable-sim-hostendian was given.
if test "${enable_sim_hostendian+set}" = set; then :
enableval=$enable_sim_hostendian; case "${enableval}" in
- no) sim_hostendian="-DWITH_HOST_BYTE_ORDER=0";;
- b*|B*) sim_hostendian="-DWITH_HOST_BYTE_ORDER=BIG_ENDIAN";;
- l*|L*) sim_hostendian="-DWITH_HOST_BYTE_ORDER=LITTLE_ENDIAN";;
+ 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";;
*) as_fn_error "\"Unknown value $enableval for --enable-sim-hostendian\"" "$LINENO" 5; sim_hostendian="";;
esac
if test x"$silent" != x"yes" && test x"$sim_hostendian" != x""; then
@@ -13250,12 +13250,12 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
esac
if test $ac_cv_c_bigendian = yes; then
- sim_hostendian="-DWITH_HOST_BYTE_ORDER=BIG_ENDIAN"
+ sim_hostendian="-DWITH_HOST_BYTE_ORDER=BFD_ENDIAN_BIG"
else
- sim_hostendian="-DWITH_HOST_BYTE_ORDER=LITTLE_ENDIAN"
+ sim_hostendian="-DWITH_HOST_BYTE_ORDER=BFD_ENDIAN_LITTLE"
fi
else
- sim_hostendian="-DWITH_HOST_BYTE_ORDER=0"
+ sim_hostendian="-DWITH_HOST_BYTE_ORDER=BFD_ENDIAN_UNKNOWN"
fi
fi
diff --git a/sim/m32r/configure.ac b/sim/m32r/configure.ac
index d92e62b..68fb20d 100644
--- a/sim/m32r/configure.ac
+++ b/sim/m32r/configure.ac
@@ -5,7 +5,7 @@ sinclude(../common/acinclude.m4)
SIM_AC_COMMON
-SIM_AC_OPTION_ENDIAN(BIG_ENDIAN)
+SIM_AC_OPTION_ENDIAN(BIG)
SIM_AC_OPTION_ALIGNMENT(STRICT_ALIGNMENT)
SIM_AC_OPTION_HOSTENDIAN
SIM_AC_OPTION_SCACHE(16384)
diff --git a/sim/m32r/traps-linux.c b/sim/m32r/traps-linux.c
index f266302..9220451 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 == LITTLE_ENDIAN)
+ if (CURRENT_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 == LITTLE_ENDIAN)
+ if (CURRENT_HOST_BYTE_ORDER == BFD_ENDIAN_LITTLE)
{
t1 = tvalue & 0xff00;
t2 = tvalue & 0x00ff;
generated by cgit v1.1 at 2024-12-04 03:03:04 +0000