<HTML><BODY><div id="composeWebView_editable_content" data-mailruapp-compose-id="composeWebView_editable_content" style="text-align: left;"><div>LGTM.</div><div><br></div><div>Sergos </div><div><br></div><div id="mail-app-auto-default-signature"><br><br>Sent from Mail.ru app for iOS<br></div><br><br>Friday, 4 October 2019, 19:43 +0300 from Igor Munkin <imun@tarantool.org>:<br><div id="composeWebView_previouse_content" data-mailruapp-compose-id="composeWebView_previouse_content"><blockquote id="mail-app-auto-quote" style="border-left-width: 1px; border-left-style: solid; border-left-color: rgb(11, 102, 249); margin: 10px 0px 10px 5px; padding: 0px 0px 0px 10px; display: inherit;" data-darkosha-id="1:1"><div class="js-helper js-readmsg-msg" data-darkosha-id="1:2" style="">
<style type="text/css" data-darkosha-id="1:3" style=""></style>
<div data-darkosha-id="1:4" style="">
<base target="_self" href="https://e.mail.ru/" data-darkosha-id="1:5" style="">
<div id="style_15702074320771299832_BODY" data-darkosha-id="1:6" style="">Part-of tarantool gh-4271<br data-darkosha-id="1:7" style="">
Part-of tarantool gh-4537<br data-darkosha-id="1:8" style="">
<br data-darkosha-id="1:9" style="">
Signed-off-by: Igor Munkin <<a href="mailto:imun@tarantool.org" data-darkosha-id="1:10" style="">imun@tarantool.org</a>><br data-darkosha-id="1:11" style="">
---<br data-darkosha-id="1:12" style="">
<br data-darkosha-id="1:13" style="">
This is a backport of original commit from v2.1 branch in LuaJIT repo.<br data-darkosha-id="1:14" style="">
<br data-darkosha-id="1:15" style="">
I found a thread in lua-l mailing list[1] about INIT_MMAP workaround<br data-darkosha-id="1:16" style="">
for FreeBSD. The submitted changeset relates to LJ_GC64 machinery and<br data-darkosha-id="1:17" style="">
is not included in master branch.<br data-darkosha-id="1:18" style="">
<br data-darkosha-id="1:19" style="">
Authored by: Mike Pall <mike><br data-darkosha-id="1:20" style="">
<br data-darkosha-id="1:21" style="">
[1]: <a href="http://lua-users.org/lists/lua-l/2010-10/msg00625.html" target="_blank" data-darkosha-id="1:22" style="">http://lua-users.org/lists/lua-l/2010-10/msg00625.html</a><br data-darkosha-id="1:23" style="">
<br data-darkosha-id="1:24" style="">
src/lj_alloc.c | 2 +-<br data-darkosha-id="1:25" style="">
1 file changed, 1 insertion(+), 1 deletion(-)<br data-darkosha-id="1:26" style="">
<br data-darkosha-id="1:27" style="">
diff --git a/src/lj_alloc.c b/src/lj_alloc.c<br data-darkosha-id="1:28" style="">
index 95d15d0..9fc761c 100644<br data-darkosha-id="1:29" style="">
--- a/src/lj_alloc.c<br data-darkosha-id="1:30" style="">
+++ b/src/lj_alloc.c<br data-darkosha-id="1:31" style="">
@@ -343,7 +343,7 @@ static void *CALL_MMAP(size_t size)<br data-darkosha-id="1:32" style="">
}<br data-darkosha-id="1:33" style="">
#endif<br data-darkosha-id="1:34" style="">
<br data-darkosha-id="1:35" style="">
-#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !LJ_TARGET_PS4<br data-darkosha-id="1:36" style="">
+#if LJ_64 && !LJ_GC64 && ((defined(__FreeBSD__) && __FreeBSD__ < 10) || defined(__FreeBSD_kernel__)) && !LJ_TARGET_PS4<br data-darkosha-id="1:37" style="">
<br data-darkosha-id="1:38" style="">
#include <sys/resource.h><br data-darkosha-id="1:39" style="">
<br data-darkosha-id="1:40" style="">
-- <br data-darkosha-id="1:41" style="">
2.23.0<br data-darkosha-id="1:42" style="">
<br data-darkosha-id="1:43" style="">
<br data-darkosha-id="1:44" style="">
</div>
<base target="_self" href="https://e.mail.ru/" data-darkosha-id="1:45" style="">
</div>
</div></blockquote></div></div></BODY></HTML>