diff options
| author | Lukas Larsson <[email protected]> | 2014-01-28 16:10:37 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-01-28 16:10:37 +0100 |
| commit | d70ca477dcc38dc1738e4c55a01e947d9b3e71c9 (patch) | |
| tree | 2cb2d14defdf8929e3c4a7c2c002e7cc92268ad7 /erts/emulator/sys/unix | |
| parent | f834be38b9ac7c07ec2c19ff42a23103cd1d8c5c (diff) | |
| parent | f5de34c3f54f1798c0932d9cb41929134649aa08 (diff) | |
| download | otp-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
Diffstat (limited to 'erts/emulator/sys/unix')
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 2 |
1 files changed, 2 insertions, 0 deletions
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 |