aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-01-28 16:10:37 +0100
committerLukas Larsson <[email protected]>2014-01-28 16:10:37 +0100
commitd70ca477dcc38dc1738e4c55a01e947d9b3e71c9 (patch)
tree2cb2d14defdf8929e3c4a7c2c002e7cc92268ad7
parentf834be38b9ac7c07ec2c19ff42a23103cd1d8c5c (diff)
parentf5de34c3f54f1798c0932d9cb41929134649aa08 (diff)
downloadotp-d70ca477dcc38dc1738e4c55a01e947d9b3e71c9.tar.gz
otp-d70ca477dcc38dc1738e4c55a01e947d9b3e71c9.tar.bz2
otp-d70ca477dcc38dc1738e4c55a01e947d9b3e71c9.zip
Merge branch 'motiejus/tile_mde3/OTP-11635'
* motiejus/tile_mde3/OTP-11635: Undefined MALLOC_USE_HASH macro on TileMDE3 Cross-compilation fix for TileraMDE-3.0.1.125620
-rw-r--r--erts/emulator/Makefile.in1
-rw-r--r--erts/emulator/sys/unix/sys.c2
-rw-r--r--xcomp/erl-xcomp-TileraMDE2.0-tilepro.conf1
3 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index b270099566..9125a8024f 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -665,7 +665,6 @@ endif
ifneq ($(filter tile-%,$(TARGET)),)
$(OBJDIR)/beam_emu.o: beam/beam_emu.c
$(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) \
- -OPT:Olimit=0 -WOPT:lpre=off:spre=off:epre=off \
$(INCLUDES) -c $< -o $@
else
# Usually the same as the default rule, but certain platforms (e.g. win32) mix
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index 59e34eb819..a5294ad84e 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -409,8 +409,10 @@ void sys_tty_reset(int exit_code)
#ifdef __tile__
/* Direct malloc to spread memory around the caches of multiple tiles. */
#include <malloc.h>
+#if defined(MALLOC_USE_HASH)
MALLOC_USE_HASH(1);
#endif
+#endif
#ifdef USE_THREADS
diff --git a/xcomp/erl-xcomp-TileraMDE2.0-tilepro.conf b/xcomp/erl-xcomp-TileraMDE2.0-tilepro.conf
index 84bf735ff2..fe0886ac8a 100644
--- a/xcomp/erl-xcomp-TileraMDE2.0-tilepro.conf
+++ b/xcomp/erl-xcomp-TileraMDE2.0-tilepro.conf
@@ -19,6 +19,7 @@
##
## File: erl-xcomp-TileraMDE2.0-tilepro.conf
## Author: Rickard Green
+## Tested on: TileraMDE-2.0, TileraMDE-3.0.1.125620
##
## -----------------------------------------------------------------------------
## When cross compiling Erlang/OTP using `otp_build', copy this file and set