From 16c4d1edacb1feeb394ebb6c49e2c04fcbd4d1b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus.jakstys@spilgames.com>
Date: Sun, 15 Dec 2013 20:04:57 +0100
Subject: Cross-compilation fix for TileraMDE-3.0.1.125620

-OPT:Olimit=0 -WOPT:lpre=off:spre=off:epre=off
tile-gcc 4.4.3 does not accept these options:

cc1: error: unrecognized command line option
"-WOPT:lpre=off:spre=off:epre=off"
---
 erts/emulator/Makefile.in                 | 1 -
 xcomp/erl-xcomp-TileraMDE2.0-tilepro.conf | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
index f442540f49..ef1e578e34 100644
--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
@@ -643,7 +643,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/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
-- 
cgit v1.2.3


From f5de34c3f54f1798c0932d9cb41929134649aa08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus.jakstys@spilgames.com>
Date: Sun, 15 Dec 2013 20:08:50 +0100
Subject: Undefined MALLOC_USE_HASH macro on TileMDE3

MALLOC_USE_HASH is not defined in TileraMDE-3, but exists in
TileraMDE-2. So use macro conditionally.
---
 erts/emulator/sys/unix/sys.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index 61f9f6a59a..a71ae4e864 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
 
-- 
cgit v1.2.3