diff options
author | Fredrik Gustafsson <[email protected]> | 2013-07-11 14:39:25 +0200 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2013-07-11 14:39:25 +0200 |
commit | 193639fde33e135cc390f1df13076e5632fdd43c (patch) | |
tree | ff96600d3421002a8754875b9fd1d6b55a25f290 /erts/emulator/beam/utils.c | |
parent | 15874f5848bb4686b1ab1986adc2e8c366492a4d (diff) | |
parent | 9e45648698862905561baa533831afd4dd23a02a (diff) | |
download | otp-193639fde33e135cc390f1df13076e5632fdd43c.tar.gz otp-193639fde33e135cc390f1df13076e5632fdd43c.tar.bz2 otp-193639fde33e135cc390f1df13076e5632fdd43c.zip |
Merge branch 'jw/fix-float-middle-endian/OTP-11201' into maint
* jw/fix-float-middle-endian/OTP-11201:
Fix binary construction on floating point middle-endian machines
Fix binary matching on floating point middle-endian machines
Fix erlang:phash2() on floating point middle-endian machines
Fix external term format BIFs on floating point middle-endian machines
Diffstat (limited to 'erts/emulator/beam/utils.c')
-rw-r--r-- | erts/emulator/beam/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/utils.c b/erts/emulator/beam/utils.c index a285c1d62b..84deaecb87 100644 --- a/erts/emulator/beam/utils.c +++ b/erts/emulator/beam/utils.c @@ -1319,7 +1319,7 @@ make_hash2(Eterm term) { FloatDef ff; GET_DOUBLE(term, ff); -#if defined(WORDS_BIGENDIAN) +#if defined(WORDS_BIGENDIAN) || defined(DOUBLE_MIDDLE_ENDIAN) UINT32_HASH_2(ff.fw[0], ff.fw[1], HCONST_12); #else UINT32_HASH_2(ff.fw[1], ff.fw[0], HCONST_12); |