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 A029D6C1AE; Wed, 19 May 2021 18:38:11 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org A029D6C1AE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1621438691; bh=pe3NxrIiddNJOxyYAUadxYJHDueLvKZPrZj6K6d8OD0=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=stmRzUFxEaFAf7kIA0SNTHOoL9B2HWiChwN/hjYOHUtpDspjMdZHkTUM/P3K8xiUC a+WkP6FziTxPxBTfzJRQyeAudcqjzCUB3KxhemRPNqL4Gy9XXihCx9rnmWfcl3uzg6 CqsRLJJOXmxwSJX4rdWLmkqxqSMxAU/FGYTrZZ7w= 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 508216C1AE for ; Wed, 19 May 2021 18:38:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 508216C1AE Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1ljOGv-0002fD-7r; Wed, 19 May 2021 18:38:09 +0300 Date: Wed, 19 May 2021 18:38:07 +0300 To: Sergey Ostanevich , Sergey Kaplun Cc: tarantool-patches@dev.tarantool.org Message-ID: <20210519153807.GU3944@tarantool.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.10.1 (2018-07-13) X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD91B019B01C53E51AFBEA66046F15EAF23C5E2F255C2D74AA700894C459B0CD1B99B96C191D8932D07377764C5BEBF0611E7D36E880CE55DDCB3FF27712106A5C5 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7646B74825E00C605EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637F7C2A16C2A438FE58638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D83A598D53452592E6BD172B29CE288D0D117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC2EE5AD8F952D28FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F446042972877693876707352033AC447995A7AD18618001F51B5FD3F9D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B682BBBAF5DF00056E089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: 0D63561A33F958A5684B38A418E94F221E49E60E8095AB1E6F1C6709D7E8573CD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA752546FE575EB473F1410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D348CDF4129B2EA85600F911E1DFA608B793E3C622D59C286FF5391EC5119ECFFDE65D7E011FB5479951D7E09C32AA3244CCDEB776E974D0735AAA099985DE658F03A76366E8A9DE7CA927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojF35yOkZDoIVRiSuFOsVQUg== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822419F7F6A53E9BEC0A4A0C2719B73B7B2A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [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 Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" I've checked the patchset into tarantool branch in tarantool/luajit and bumped a new version in master. Furthermore, I've checked the first patch of the series ('build: pass sysroot to MacOS SDK') into other long-term branches in tarantool/luajit and bumped a new version in 1.10, 2.7 and 2.8 also. On 11.05.21, Igor Munkin wrote: > 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. > > > -- > 2.25.0 > -- Best regards, IM