From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 758916F815; Tue, 11 May 2021 01:30:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 758916F815 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1620685823; bh=0Jp9alceoLvQ9R1gSCOVFaGiUmRwNJWFOI0/kogDI9U=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=ZWsVTkMR/1VXZqCoOF7/rbEdQSbn4SHV1sHLM4wcpHKsuqaQefDVMsgLbuw4aVDg8 EkKjcMK2+IGLJWuTGE/s5yIlXCCO7sn/GPJ6vYZYhfLAh4JgHj9Kw0EUFlQ/QWcr+D SB1lWbVN5N/RG6LolIhnqx00PF/XWYV0k/gvokvo= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 8B60F6F3C4 for ; Tue, 11 May 2021 01:30:21 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8B60F6F3C4 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lgEPs-0001ky-E9; Tue, 11 May 2021 01:30:20 +0300 To: Sergey Ostanevich , Sergey Kaplun Date: Tue, 11 May 2021 01:09:04 +0300 Message-Id: X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD95978C26455E69BE0068EDCB750753685DC8F791B892E4B69182A05F538085040B2D405C1FC69A862B8E24477CE01D45EB71DD2CB383122026A8336FB67594EDD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7AB524098FB2F2222EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B12C6B1582157D838638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2BE65EAF985D825B33A708E3050EE960AE5D25F19253116ADD2E47CDBA5A96583C09775C1D3CA48CFCF36E64A7E3F8E58117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE78A0F7C24A37A3D769FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA71A620F70A64A45A98AA50765F79006372E808ACE2090B5E1725E5C173C3A84C3C5EA940A35A165FF2DBA43225CD8A89F616AD31D0D18CD5CCE5475246E174218B5C8C57E37DE458BEDA766A37F9254B7 X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C978315B91A4E0F07C724B92B5ACE33AB3463B X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C08CF033E463A508818E98C40A0BC8FDDBF752D5EE557A21D9C2B6934AE262D3EE7EAB7254005DCEDA59F2C00BD1B740C1E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0279E343DB675BB2F8E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3403182E70AE6895E0F5097ACA7EE2B814B8FE906A581FF7F875C06B58295AC39B7D4BD44D1CAF01271D7E09C32AA3244C16F36FAFF8E5F0DF14C58928BBA89CAB5595C85A795C7BAE927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojW8rfvRc3+AqksYFosa2MjQ== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822208BBB7F535298D5D6FFBF3DE3972196A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH luajit 0/3] Basic fixes for LuaJIT on ARM64 Macs X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This series consists of the three patches: the one for CMake build machinery and two commits backported from the vanilla LuaJIT trunk[1]. If the latter commits are OK, they can be uses as an examples in backporting procedure document[2] for the others to be adopted. The first patch fixes the issue missed in #4862: CMake machinery fails to locate system headers provided by SDK on MacOS platforms. The bug was unnoticed for a while, since Tarantool testing environment doesn't use Debug build with LUA_USE_ASSERT enabled on MacOS hosts. Anyway, even if there was Debug build, there is a mess with the flags as a result of #4862, so LuaJIT internal assertions would be enabled neither. The fix contains of two parts: 1. Set the sysroot to SDK root directory if it is not set before. 2. Use ${CMAKE_C_FLAGS} in auxiliary routine. The second patch is a backport of 2e2fb8f[3]. When Apple released Macs working on ARM64, the previous recipe in lj_arch.h for detecting Apple platforms is not valid anymore. Fortunately, there is a system header (i.e. TargetConditionals.h), provided by SDK with the proper defines to be set. Since testing machinery assumes that LuaJIT is built with JIT support being enabled unconditionally, a smoke test for it is also added alongside with this patch. The third patch is a backport of 521b367[4]. This patch fixes the issue introduced by commit 2e2fb8f6b5118e1a7996b76600c6ee98bfd5f203 ('OSX/iOS: Handle iOS simulator and ARM64 Macs.'). Within the mentioned commit LJ_TARGET_IOS define is set via Apple system header to enable several features (e.g. JIT and external unwinder) on ARM64 Macs, but its usage was not adjusted source-wide. This is done for FFI machinery within this commit. Since all LJ_TARGET_IOS usage is done with LJ_TARGET_ARM64 define being set, we can simply replace all entries with LJ_TARGET_OSX. Branch: https://github.com/tarantool/luajit/tree/imun/gh-5983-fix-build-on-m1 Issues: * https://github.com/tarantool/tarantool/issues/5983 * https://github.com/tarantool/tarantool/issues/5629 * https://github.com/tarantool/tarantool/issues/4862 CI looks to be OK[5] except the known problems with ASAN[6]. [1]: https://github.com/LuaJIT/LuaJIT [2]: https://github.com/tarantool/tarantool/wiki/LuaJIT-backporting-guidelines [3]: https://github.com/LuaJIT/LuaJIT/commit/2e2fb8f [4]: https://github.com/LuaJIT/LuaJIT/commit/521b367 [5]: https://github.com/tarantool/tarantool/commit/fba91e1 [6]: https://github.com/tarantool/tarantool/issues/6031 Igor Munkin (1): build: pass sysroot to MacOS SDK Mike Pall (2): OSX/iOS: Handle iOS simulator and ARM64 Macs. FFI/ARM64/OSX: Fix vararg call handling. CMakeLists.txt | 9 +++++++++ cmake/LuaJITUtils.cmake | 7 ++++++- src/lj_arch.h | 8 +++++++- src/lj_ccall.c | 8 ++++---- src/lj_ccallback.c | 2 +- .../gh-5983-jit-library-smoke-tests.test.lua | 11 +++++++++++ .../lj-695-ffi-vararg-call.test.lua | 16 ++++++++++++++++ 7 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 test/tarantool-tests/gh-5983-jit-library-smoke-tests.test.lua create mode 100644 test/tarantool-tests/lj-695-ffi-vararg-call.test.lua -- 2.25.0