summaryrefslogtreecommitdiff
path: root/src/lj_state.c
diff options
context:
space:
mode:
authorMike Pall <mike>2014-04-21 22:26:46 +0200
committerMike Pall <mike>2014-04-21 22:26:46 +0200
commitf3374b526619671fe576d593dcdc6bd048bf5603 (patch)
treecbd75e5da96e2f3b2c425e9307bf734603e4e27b /src/lj_state.c
parent65626eac23633bfb511513b55b2b4dec5d50e4d3 (diff)
downloadluajit-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 '')
-rw-r--r--src/lj_state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_state.c b/src/lj_state.c
index f972fdce..b9eaef46 100644
--- a/src/lj_state.c
+++ b/src/lj_state.c
@@ -175,7 +175,7 @@ static void close_state(lua_State *L)
175 g->allocf(g->allocd, G2GG(g), sizeof(GG_State), 0); 175 g->allocf(g->allocd, G2GG(g), sizeof(GG_State), 0);
176} 176}
177 177
178#if LJ_64 178#if LJ_64 && !(defined(LUAJIT_USE_VALGRIND) && defined(LUAJIT_USE_SYSMALLOC))
179lua_State *lj_state_newstate(lua_Alloc f, void *ud) 179lua_State *lj_state_newstate(lua_Alloc f, void *ud)
180#else 180#else
181LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud) 181LUA_API lua_State *lua_newstate(lua_Alloc f, void *ud)