diff options
author | Mike Pall <mike> | 2014-04-21 22:26:46 +0200 |
---|---|---|
committer | Mike Pall <mike> | 2014-04-21 22:26:46 +0200 |
commit | f3374b526619671fe576d593dcdc6bd048bf5603 (patch) | |
tree | cbd75e5da96e2f3b2c425e9307bf734603e4e27b /src/lib_aux.c | |
parent | 65626eac23633bfb511513b55b2b4dec5d50e4d3 (diff) | |
download | luajit-f3374b526619671fe576d593dcdc6bd048bf5603.tar.gz luajit-f3374b526619671fe576d593dcdc6bd048bf5603.tar.bz2 luajit-f3374b526619671fe576d593dcdc6bd048bf5603.zip |
x64: Allow building with LUAJIT_USE_SYSMALLOC and LUAJIT_USE_VALGRIND.
Valgrind 3.9 killed MAP_32BIT support. Ugh. So now we have to rely on
undocumented behavior where Valgrind always allocates from the bottom
of memory. Alas, such a binary won't run properly without Valgrind.
Diffstat (limited to 'src/lib_aux.c')
-rw-r--r-- | src/lib_aux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib_aux.c b/src/lib_aux.c index 1b01fe07..e88dc7c2 100644 --- a/src/lib_aux.c +++ b/src/lib_aux.c | |||
@@ -302,7 +302,7 @@ static int panic(lua_State *L) | |||
302 | 302 | ||
303 | #ifdef LUAJIT_USE_SYSMALLOC | 303 | #ifdef LUAJIT_USE_SYSMALLOC |
304 | 304 | ||
305 | #if LJ_64 | 305 | #if LJ_64 && !defined(LUAJIT_USE_VALGRIND) |
306 | #error "Must use builtin allocator for 64 bit target" | 306 | #error "Must use builtin allocator for 64 bit target" |
307 | #endif | 307 | #endif |
308 | 308 | ||