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 iPrcCeSbp2GCDQAAgWs5BA (envelope-from ) for ; Wed, 01 Dec 2021 16:59:32 +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 SJRuBeSbp2FRaQAAbx9fmQ (envelope-from ) for ; Wed, 01 Dec 2021 15:59:32 +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 CEC632A250 for ; Wed, 1 Dec 2021 16:59:31 +0100 (CET) Received: from localhost ([::1]:47128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1msS15-0005xZ-05 for larch@yhetil.org; Wed, 01 Dec 2021 10:59:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1msRwk-000746-PO for guix-patches@gnu.org; Wed, 01 Dec 2021 10:55:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33727) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1msRwk-0006H0-Gy for guix-patches@gnu.org; Wed, 01 Dec 2021 10:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1msRwk-0005Jg-Ff for guix-patches@gnu.org; Wed, 01 Dec 2021 10:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52186] [core-updates-frozen PATCH v2 01/17] gnu: libunwind-julia: Fix build on i686-linux. References: <20211129182108.54695-1-zimon.toutoune@gmail.com> In-Reply-To: <20211129182108.54695-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Dec 2021 15:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52186 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52186@debbugs.gnu.org Cc: efraim@flashner.co.il, maxim.cournoyer@gmail.com, zimoun Received: via spool by 52186-submit@debbugs.gnu.org id=B52186.163837406120230 (code B ref 52186); Wed, 01 Dec 2021 15:55:02 +0000 Received: (at 52186) by debbugs.gnu.org; 1 Dec 2021 15:54:21 +0000 Received: from localhost ([127.0.0.1]:45237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRw4-0005G9-Hb for submit@debbugs.gnu.org; Wed, 01 Dec 2021 10:54:20 -0500 Received: from mail-wm1-f45.google.com ([209.85.128.45]:56035) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1msRw2-0005FZ-U5 for 52186@debbugs.gnu.org; Wed, 01 Dec 2021 10:54:19 -0500 Received: by mail-wm1-f45.google.com with SMTP id p18so20787029wmq.5 for <52186@debbugs.gnu.org>; Wed, 01 Dec 2021 07:54:18 -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=QcuoxVH55jHAR1uUeJIzZSHZkqpg05e4SoLW1hRsvkQ=; b=jVwNQTmgnnXk3gRC+GfL6rR6lo+Yo3eEw5FypsOg7G2JxhzmtopizAmgJvNomEPz8Y NDkldUmjbxBcpTKJq3Bfp6YacfGBwCGPGWdOOuF9PHp1j7elEN5CaqRLha8u3Od5F6rY yeEZmreN9plP5tfzIRpUoojDgM4FPLiPttpKKzncD1UM+wyRuE5zZxnzT13HzOj+Gdgv qJyMB0jTeC/rYCrsK9Qvum8BigSRSEs417rlWQ6h2/u64skxX4p+CQ4ZJnTQ5AFRFh22 5e+uoPzRDblYLMrmRgefmkeBI1Qp/vdz/501euZmwq0AHm5DSmrv156PhI5rhhh99O67 UAFw== 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=QcuoxVH55jHAR1uUeJIzZSHZkqpg05e4SoLW1hRsvkQ=; b=CbJx5SclcEKjl5HP5rZ8P+hBsHoMy1LBa+fpM+QD3/JbPasX8TEOX0bp8TNlj62XXr FvxfLm0viU3nya4YjDYkcl+MI4scUKZGovCEQJXMNxLBtrZjQgP7pmZphFhTJdX0kEhS 9jAK9odPeTYmAYmwsfVzw7bwgnv/cPf9IIm1dVsyw592ueZSkS5QwD8EABMt+tF6InaC N5LC32KGS3pesEbr9M3XKIUlBrVBGyzB1V/4psvPx/0EJ7whNxySlCnmZh22uiJEEbah AXO8Gkz6E+geoX/4RastUukhKfNHFyXpbzelCej1pvvzbGWFJ1gUW592q6pOZb/GcgBp tolg== X-Gm-Message-State: AOAM533/e2lS06UBp/tyanJ8rx+1wYI9sbzC2UzWGubXmCpFvNyMUJBf Z+w3TuHV7gTKkh0LiorHlhJanTM/WHo= X-Google-Smtp-Source: ABdhPJyETWFnT0Sj8+EDVcSpZPr6PqZWW5XyqNVj119tc0urUslquaLG4RMMtvMvNpGdKDczjMGg0w== X-Received: by 2002:a05:600c:4fcc:: with SMTP id o12mr8316842wmq.110.1638374053275; Wed, 01 Dec 2021 07:54:13 -0800 (PST) Received: from localhost.localdomain ([193.48.40.110]) by smtp.gmail.com with ESMTPSA id j40sm150903wms.16.2021.12.01.07.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 07:54:12 -0800 (PST) From: zimoun Date: Wed, 1 Dec 2021 16:53:47 +0100 Message-Id: <20211201155355.60845-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638374371; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=QcuoxVH55jHAR1uUeJIzZSHZkqpg05e4SoLW1hRsvkQ=; b=DTc0dkQGPlXms4SnSlBkSD1QvYFbLQvq74DUjdXIm8VXXtPJ2FWo//lmZ52cCp2oVNsCF2 TZF+vuMj94cIChct2NphpZ8pjIIwXO4VbGH/BIeIrdebmnSoDtwwE/E1NbFLyRtmFPdqsQ 7GksZDIlw0YRKQxhdubNDELQcKNTla2bSBN0yFYojeD+0rINqEAshq6qDQgDIHdnbJ/I/V tFZLKj2FCZ1Jo5hOVFivJiTPustqemrL4i1xxk4E1TaBx/ifbOo2/TVbYoXhQaNqp/fOVt inKkdwnmLemqNV0dSgp6p0I3hrKv++1B+Y3vaOGFZwj7DZPtMD+YxB4G48G6pQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638374371; a=rsa-sha256; cv=none; b=rzqAqfUXZbaz178qiEvcZ4mnnbYSNuaa1h118ag1M3/wW1J2o6tsV1tv5JF129/KYR59zF sG6rCHoj5p5gjCxfxQdIqyv2gXh9Ewzm0FnsucTUvmMgTb2MGyM7vdwsR2L/9O/0AkhOux hz5d7M/Mzk/Rz4uh53S7IvOO8N9/+RDwt4lHF7z/PSVccwoEVl7X8OpAO0tlonSZvpHB/G 6wn0Fc+otdkNzHibPO07DkyhkPMWC0Y6I1T9JM4FZcle1qgRH4oInEpYDMXZ97g7mnE1iH JnGjcrI3A3Sg9/7mFW/lhW+Vzi0dKntxl57kqANV8QhO2fyEbwpQNgqivNbIvw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=jVwNQTmg; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 0.19 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=jVwNQTmg; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: CEC632A250 X-Spam-Score: 0.19 X-Migadu-Scanner: scn0.migadu.com X-TUID: CyWd1BFEd7Ju * 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 2fc05ba703..ae024484c5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1388,6 +1388,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; + } + -- 2.32.0