From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QDCaE1IapWF/QAAAgWs5BA (envelope-from ) for ; Mon, 29 Nov 2021 19:22:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id SNU8D1IapWFPHAAAbx9fmQ (envelope-from ) for ; Mon, 29 Nov 2021 18:22:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DB3EE8DE7 for ; Mon, 29 Nov 2021 19:22:09 +0100 (CET) Received: from localhost ([::1]:44170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrlI0-0006Hn-Dt for larch@yhetil.org; Mon, 29 Nov 2021 13:22:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrlHv-0006G5-BO for guix-patches@gnu.org; Mon, 29 Nov 2021 13:22:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:56010) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrlHv-0002V7-2A for guix-patches@gnu.org; Mon, 29 Nov 2021 13:22:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrlHu-0005V2-K0; Mon, 29 Nov 2021 13:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52186] [core-updates-frozen] [PATCH] gnu: libunwind-julia: Fix build on i686-linux. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Mon, 29 Nov 2021 18:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52186@debbugs.gnu.org Cc: zimoun , , X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: , Received: via spool by submit@debbugs.gnu.org id=B.163821009121071 (code B ref -1); Mon, 29 Nov 2021 18:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Nov 2021 18:21:31 +0000 Received: from localhost ([127.0.0.1]:39321 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrlHL-0005Ti-Eo for submit@debbugs.gnu.org; Mon, 29 Nov 2021 13:21:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:44860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrlHJ-0005T7-2x for submit@debbugs.gnu.org; Mon, 29 Nov 2021 13:21:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrlHI-0005Uu-U0 for guix-patches@gnu.org; Mon, 29 Nov 2021 13:21:24 -0500 Received: from [2a00:1450:4864:20::434] (port=39433 helo=mail-wr1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrlHG-0002JO-Nr for guix-patches@gnu.org; Mon, 29 Nov 2021 13:21:24 -0500 Received: by mail-wr1-x434.google.com with SMTP id a18so38839695wrn.6 for ; Mon, 29 Nov 2021 10:21:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=UASj0qKHbC24x1Wx+oB2mxjwtWTfcCJod5TNpQEmW/Y=; b=bIgU/9Ph9NE3IFCxE2U84Ecx7MkXWQhxHCBrUBy5eADhT1RjC6AbiEPYZ+iaxv5YTm gnlqbk6Z25MlIiqOGbf50ZIw2ot9Z5P3lJwC9i7BTBZk6WMelw26bJZHMLa9TceSsKUt XqgsXNXlPn7VoL5yKqm5Un2etfRx/fVjcqb2Ufxo/JXQ/xv3ncM1Y635+KDNgdXEjnpv lmeoc5bsASaM3iitctJVqCBHZtIeeM3E8JJChHTLvLR9f5F0HAPA8OZK71bM6/OrL6a1 mh3MRCFYbFb8ICASd8hYHy5pZxuKnMgCyR7rdl25exyrIOjMAVudOHbg/xTZu03E7Nw0 xPlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=UASj0qKHbC24x1Wx+oB2mxjwtWTfcCJod5TNpQEmW/Y=; b=JA9fe0SivuS3pRi9uyE7asF7yxD6DVFU8WG+PJAXUWMpZga5/3K8aDu9kTQUu/U5rm cZvmXKE6E7DqKLFMdNaadm8dAX8Ncjk24tQsNRyshkBlYYFqzwF0M6ggbxmiR0ewPEZL FWEiEhUl64zpgiFhiknh+YQkNyni6QdWrOCs0o/V/gVWnBOreENSqZKjxfgZzzd95i5/ Nfs9jmWy4EIiVL8RM/fMlAkWUGQ4CO+1/sDNhaFZ7VHupl7S7WRhA3O5SmNqsGJKiTIv q79iGArQ9xvUaQkXGfl9fuYbcXzwut+mEJMLnuzF+l6vgAESGgc/MGQRoMnGQSBS5969 woOQ== X-Gm-Message-State: AOAM533GU575Z9j3qecoU0xLOSMQlovTVKT/0nMeGd0Vn8qvKD8e5v9y vEc7wfV6Lm+I+glclEMYRBmTva1P24k= X-Google-Smtp-Source: ABdhPJz+uhxiq/WqsHQdvyfJPYppiRQ3td7eMU7fEZ1rLIj4Zx1Eh8vlKQ/LdETui/WKsySq+HBpZQ== X-Received: by 2002:adf:a145:: with SMTP id r5mr33993401wrr.462.1638210081273; Mon, 29 Nov 2021 10:21:21 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id t189sm61493wma.8.2021.11.29.10.21.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Nov 2021 10:21:20 -0800 (PST) From: zimoun Date: Mon, 29 Nov 2021 19:21:08 +0100 Message-Id: <20211129182108.54695-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::434 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638210130; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=UASj0qKHbC24x1Wx+oB2mxjwtWTfcCJod5TNpQEmW/Y=; b=evEepY25sy2Lo5B5GPmwpyFdT/8F/RBpkHyuiPUEdxGdS5GFWvzyENV59Sm1ATgs3vxIAP 2zoiJb8K5G5eUyvs732XfR52hrS8RndByy8KIgdMN6n3NJw3J9pZiETTQsxsialxvwL6Mg NK4196V+MddcNOJmBnnxozzJqQgFxdYldcrjjfW/OQIvp5ctwwBLKn491CaiE9BYt6mSu2 r5ztqh+thLK6cyx2SjJYuwNfcykh6yb3vfx53XJixjiaa0Uiq4Q1w3UXYNKlA4gppnPgBl YUErRnZ7vMvUHTWkmgO3YPKXkMCWcVPVJlqNIAqYRzP2wAP0rd3j5bbWBCqOSg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638210130; a=rsa-sha256; cv=none; b=WwzMMFx/AnKbT/tY+OXPfl8v8NJlis7KDh5j//R3KoP7EoUZWBz+0BYNgE851DORogLiRn dcXiAOh/vszioxCh0KMjcp4Oi1JSJHnywjJtnCaO7nRj4IrUbxNXoa97mS0EA8btjgDGKt QluKIvt40i6nN/gn7YWjzN8saEEiGSqO7dnSZ8plae9KJox+IyzTMRp7zAHAtdbZTVMxs7 yUVI5gMqx+B031y3moMitC06+YcVx+duptPCGhgmjuo3uxKQjsEIvsZ+XX07x/HsntGvrb OOsbtcp7xLLieDREETkO1hM0CF3pDCTlzRenmhyCmSwUzHzV3UkGmHELrqs+IQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="bIgU/9Ph"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.49 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="bIgU/9Ph"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: DB3EE8DE7 X-Spam-Score: 3.49 X-Migadu-Scanner: scn1.migadu.com X-TUID: Sb2FyV+rQO8i * gnu/packages/julia.scm (libunwind)[origin]: Add patch. * gnu/packages/patches/libunwind-julia-fix-GCC10-fno-common.patch: New file. * gnu/local/mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/julia.scm | 18 +++++---- ...libunwind-julia-fix-GCC10-fno-common.patch | 40 +++++++++++++++++++ 3 files changed, 52 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/libunwind-julia-fix-GCC10-fno-common.patch diff --git a/gnu/local.mk b/gnu/local.mk index 604c6cf151..6e71ad404e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1386,6 +1386,7 @@ dist_patch_DATA = \ %D%/packages/patches/libtirpc-hurd.patch \ %D%/packages/patches/libtommath-fix-linkage.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ + %D%/packages/patches/libunwind-julia-fix-GCC10-fno-common.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libusb-for-axoloti.patch \ %D%/packages/patches/libutils-add-includes.patch \ diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 83aa8b1099..17f4a9a169 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -71,13 +71,17 @@ (define libunwind-julia (base32 "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3")) (patches - (list - (julia-patch "libunwind-prefer-extbl" - "0lr4dafw8qyfh8sw8hhbwkql1dlhqv8px7k81y2l20hhxfgnh2m1") - (julia-patch "libunwind-static-arm" - "1jk3bmiw61ypcchqkk1fyg5wh8wpggk574wxyfyaic870zh3lhgq") - (julia-patch "libunwind-cfa-rsp" - "1aswjhvysahhldbzh1afbf0hsjxrvs6xidsz2i7s1cjkjbdiia1z"))))) + (append + ;; Fix linker issue for i686-linux because GCC10 changed default + ;; (see '-fno-common' option). + (search-patches "libunwind-julia-fix-GCC10-fno-common.patch") + (list + (julia-patch "libunwind-prefer-extbl" + "0lr4dafw8qyfh8sw8hhbwkql1dlhqv8px7k81y2l20hhxfgnh2m1") + (julia-patch "libunwind-static-arm" + "1jk3bmiw61ypcchqkk1fyg5wh8wpggk574wxyfyaic870zh3lhgq") + (julia-patch "libunwind-cfa-rsp" + "1aswjhvysahhldbzh1afbf0hsjxrvs6xidsz2i7s1cjkjbdiia1z")))))) (home-page "https://github.com/JuliaLang/tree/master/deps/"))) (define (julia-patch-url version name) diff --git a/gnu/packages/patches/libunwind-julia-fix-GCC10-fno-common.patch b/gnu/packages/patches/libunwind-julia-fix-GCC10-fno-common.patch new file mode 100644 index 0000000000..8ef4b111e4 --- /dev/null +++ b/gnu/packages/patches/libunwind-julia-fix-GCC10-fno-common.patch @@ -0,0 +1,40 @@ +Fix compilation with -fno-common. + +Borrowed from upstream 29e17d8d2ccbca07c423e3089a6d5ae8a1c9cb6e. +Author: Yichao Yu +AuthorDate: Tue Mar 31 00:43:32 2020 -0400 +Commit: Dave Watson +CommitDate: Tue Mar 31 08:06:29 2020 -0700 + +diff --git a/src/x86/Ginit.c b/src/x86/Ginit.c +index f6b8dc2..9550efa 100644 +--- a/src/x86/Ginit.c ++++ b/src/x86/Ginit.c +@@ -54,13 +54,6 @@ tdep_uc_addr (ucontext_t *uc, int reg) + + # endif /* UNW_LOCAL_ONLY */ + +-HIDDEN unw_dyn_info_list_t _U_dyn_info_list; +- +-/* XXX fix me: there is currently no way to locate the dyn-info list +- by a remote unwinder. On ia64, this is done via a special +- unwind-table entry. Perhaps something similar can be done with +- DWARF2 unwind info. */ +- + static void + put_unwind_info (unw_addr_space_t as, unw_proc_info_t *proc_info, void *arg) + { +@@ -71,7 +64,12 @@ static int + get_dyn_info_list_addr (unw_addr_space_t as, unw_word_t *dyn_info_list_addr, + void *arg) + { +- *dyn_info_list_addr = (unw_word_t) &_U_dyn_info_list; ++#ifndef UNW_LOCAL_ONLY ++# pragma weak _U_dyn_info_list_addr ++ if (!_U_dyn_info_list_addr) ++ return -UNW_ENOINFO; ++#endif ++ *dyn_info_list_addr = _U_dyn_info_list_addr (); + return 0; + } + base-commit: f22dfba53032c59fb260173143abf0e4e9a4f1e1 -- 2.32.0