From patchwork Tue Jun 4 09:09:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 1943224 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VtlM325Sgz20WL for ; Tue, 4 Jun 2024 19:15:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 5FA0F404AB; Tue, 4 Jun 2024 09:15:57 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 0JniAApeVhea; Tue, 4 Jun 2024 09:15:56 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 282FC404EB Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 282FC404EB; Tue, 4 Jun 2024 09:15:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C73551BF2B9 for ; Tue, 4 Jun 2024 09:15:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BFB0D4095D for ; Tue, 4 Jun 2024 09:15:53 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id vuEKBj2yPvxt for ; Tue, 4 Jun 2024 09:15:52 +0000 (UTC) X-Greylist: delayed 385 seconds by postgrey-1.37 at util1.osuosl.org; Tue, 04 Jun 2024 09:15:51 UTC DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 4400B40950 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4400B40950 Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=89.234.176.197; helo=aposti.net; envelope-from=paul@crapouillou.net; receiver= Received: from aposti.net (aposti.net [89.234.176.197]) by smtp4.osuosl.org (Postfix) with ESMTPS id 4400B40950 for ; Tue, 4 Jun 2024 09:15:51 +0000 (UTC) From: Paul Cercueil To: buildroot@buildroot.org Date: Tue, 4 Jun 2024 11:09:15 +0200 Message-ID: <20240604090915.10444-1-paul@crapouillou.net> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1717492163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=V8byb5jKzE8FBrZVWNkFxcBTQq1A/CWcxW37rQ4Ou5c=; b=XWiHMSWNam1qnl6PBLTfjBnp0uis9SyAKkYX1S1AzO/UdKeM+q7lut8FpNU1K1B/oMvh0A RumVJKgDIfpdKt2hms1VtVsQOA6Eh6zRtajQ557AWloT6FiXqD5Ia0XDATzN+f4HFBgERO 4dNRP/GEoPpyXSn3C31Twb8AxzlYdbw= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=crapouillou.net X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=crapouillou.net header.i=@crapouillou.net header.a=rsa-sha256 header.s=mail header.b=XWiHMSWN Subject: [Buildroot] [PATCH] package/lightning: fix build on mips64 with n32 ABI X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Cercueil Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Grab commit 778d326740f9893c398f959b419629935b613099 from upstream to fix the build on mips64 and mips64el when the n32 ABI is used. Fixes: http://autobuild.buildroot.net/results/27123bf0ddc84599bceb02ac987327817d498659/ Signed-off-by: Paul Cercueil --- ...ips-Fix-build-on-MIPS64-with-n32-ABI.patch | 132 ++++++++++++++++++ 1 file changed, 132 insertions(+) create mode 100644 package/lightning/0001-mips-Fix-build-on-MIPS64-with-n32-ABI.patch diff --git a/package/lightning/0001-mips-Fix-build-on-MIPS64-with-n32-ABI.patch b/package/lightning/0001-mips-Fix-build-on-MIPS64-with-n32-ABI.patch new file mode 100644 index 0000000000..00e5eee8fb --- /dev/null +++ b/package/lightning/0001-mips-Fix-build-on-MIPS64-with-n32-ABI.patch @@ -0,0 +1,132 @@ +From 66a9a994c03d65fc37d701a60b26506bede49ae1 Mon Sep 17 00:00:00 2001 +From: Paul Cercueil +Date: Sun, 2 Jun 2024 22:35:24 +0200 +Subject: [PATCH] mips: Fix build on MIPS64 with n32 ABI + +The build on MIPS64 with n32 ABI was broken for a few reasons. + +- The _movi_d_w() functions had a different prototype in jit_mips-fpu.c + than in lightning.c; +- The movi_d_w() was still provided by lightning.c even though + jit_mips-fpu.c provides its own version; +- The "ww" opcodes were allowed, which was probably not meant to happen. + +Fixes a build issue reported by Buildroot: +http://autobuild.buildroot.net/results/27123bf0ddc84599bceb02ac987327817d498659/ + +Signed-off-by: Paul Cercueil +--- + lib/jit_mips-fpu.c | 4 ++-- + lib/jit_mips.c | 3 +-- + lib/lightning.c | 43 +++++++++++++++++++++---------------------- + 3 files changed, 24 insertions(+), 26 deletions(-) + +diff --git a/lib/jit_mips-fpu.c b/lib/jit_mips-fpu.c +index 61db30e..8ad97e9 100644 +--- a/lib/jit_mips-fpu.c ++++ b/lib/jit_mips-fpu.c +@@ -349,7 +349,7 @@ static void _movi_f(jit_state_t*,jit_int32_t,jit_float32_t*); + # define movi64(r0, i0) _movi64(_jit, r0, i0) + static void _movi64(jit_state_t*,jit_int32_t,jit_int64_t); + # define movi_d_w(r0, i0) _movi_d_w(_jit, r0, i0) +-static void _movi_d_w(jit_state_t*,jit_int32_t,jit_int64_t); ++static void _movi_d_w(jit_state_t*,jit_int32_t,jit_float64_t); + # elif __WORDSIZE == 64 + # define movi64(r0, i0) movi(r0, i0) + # endif +@@ -1152,7 +1152,7 @@ _movi64(jit_state_t *_jit, jit_int32_t r0, jit_int64_t i0) + } + + static void +-_movi_d_w(jit_state_t *_jit, jit_int32_t r0, jit_int64_t i0) ++_movi_d_w(jit_state_t *_jit, jit_int32_t r0, jit_float64_t i0) + { + union { + jit_int64_t l; +diff --git a/lib/jit_mips.c b/lib/jit_mips.c +index 4fb6c34..6eb41a0 100644 +--- a/lib/jit_mips.c ++++ b/lib/jit_mips.c +@@ -2184,8 +2184,7 @@ _emit_code(jit_state_t *_jit) + case jit_code_movi_w_d: + movi_w_d(rn(node->u.w), node->v.w); + break; +-#endif +-#if __WORDSIZE == 32 ++#else + case jit_code_movr_ww_d: + movr_ww_d(rn(node->u.w), rn(node->v.w), rn(node->w.w)); + break; +diff --git a/lib/lightning.c b/lib/lightning.c +index b40d35b..2c10928 100644 +--- a/lib/lightning.c ++++ b/lib/lightning.c +@@ -4331,12 +4331,12 @@ static void _htoni_ul(jit_state_t*, jit_int32_t, jit_word_t); + #endif + # define movi_f_w(r0, i0) _movi_f_w(_jit, r0, i0) + static void _movi_f_w(jit_state_t*, jit_int32_t, jit_float32_t); +-#if __WORDSIZE == 32 && !(defined(__mips__) && NEW_ABI) +-# define movi_d_ww(r0, r1, i0) _movi_d_ww(_jit, r0, r1, i0) +-static void _movi_d_ww(jit_state_t*, jit_int32_t, jit_int32_t, jit_float64_t); +-#else ++#if __WORDSIZE == 64 + # define movi_d_w(r0, i0) _movi_d_w(_jit, r0, i0) + static void _movi_d_w(jit_state_t*, jit_int32_t, jit_float64_t); ++#elif !(defined(__mips__) && NEW_ABI) ++# define movi_d_ww(r0, r1, i0) _movi_d_ww(_jit, r0, r1, i0) ++static void _movi_d_ww(jit_state_t*, jit_int32_t, jit_int32_t, jit_float64_t); + #endif + #define cloi(r0, i0) _cloi(_jit, r0, i0) + static void _cloi(jit_state_t*, jit_int32_t, jit_word_t); +@@ -4803,7 +4803,23 @@ _movi_f_w(jit_state_t *_jit, jit_int32_t r0, jit_float32_t i0) + movi(r0, data.i); + } + +-#if __WORDSIZE == 32 && !(defined(__mips__) && NEW_ABI) ++#if __WORDSIZE == 64 ++static void ++_movi_d_w(jit_state_t *_jit, jit_int32_t r0, jit_float64_t i0) ++{ ++ union { ++ jit_int64_t l; ++ jit_float64_t d; ++ } data; ++ data.d = i0; ++# if defined(__ia64__) ++ /* Should be used only in this case (with out0 == 120) */ ++ if (r0 >= 120) ++ r0 = _jitc->rout + (r0 - 120); ++# endif ++ movi(r0, data.l); ++} ++#elif !(defined(__mips__) && NEW_ABI) + static void + _movi_d_ww(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_float64_t i0) + { +@@ -4821,23 +4837,6 @@ _movi_d_ww(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_float64_t i0) + movi(r0, data.i[1]); + # endif + } +- +-#else +-static void +-_movi_d_w(jit_state_t *_jit, jit_int32_t r0, jit_float64_t i0) +-{ +- union { +- jit_int64_t l; +- jit_float64_t d; +- } data; +- data.d = i0; +-# if defined(__ia64__) +- /* Should be used only in this case (with out0 == 120) */ +- if (r0 >= 120) +- r0 = _jitc->rout + (r0 - 120); +-# endif +- movi(r0, data.l); +-} + #endif + + void +-- +2.43.0 +