From patchwork Mon Jun 5 20:53:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 103098 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1107723qgd; Mon, 5 Jun 2017 13:53:37 -0700 (PDT) X-Received: by 10.98.66.131 with SMTP id h3mr10137749pfd.12.1496696017501; Mon, 05 Jun 2017 13:53:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496696017; cv=none; d=google.com; s=arc-20160816; b=Q7yQJIiyJHQnEWFyIaEMz+wAKMrciNaxeyVAFbeXjveaoVenjqUA6mOgN3k78bUGMs GYa5zqAdzNy3Sm1Yfu6t4d1TxgTmok/heXUGpmXwAnu0PKKxWgy//17ytV9qg/pdoagn AChMQlD9JphLuZAd7zcO3+gROFu0qQepekcwpvZvTmlnIrcoD5VFd0GUd6MXdSaimEMd QpoAK2mj7bSh3EwkBREs32i7dh4Hk8suAwhAS3QAAy8MvDvi1ZIOX7j9Gi92D74NHLsq 5u4k5/tcJG6Hlmf6SFD8S5mib0JRDE/wUifVqx+uV7vjRbUW8Rhdi1/KpA216vK0cSf4 DonA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=QW2EjdPAAv1iGwDN3y/f/JbgqifV2UVzd1e0CD2dygc=; b=gG4QxwOL9xPj0eiQ0WeB7SaYP5tm5MZVaTwkeGtOadYh3iWILm5c79x/EWLhCeApT/ D4BWNZJL6ANQjp4VDaFq7gDGdYT5/WEa+ylkanUWEtAj+d7wQG7TSQZdFgSDDiVazQS1 he9weQ3zEz25ne/FR9fIQpz+NroQGXrK+47YGeYicUVIPNtfciOciXzUOLqsNAKsN+r4 uJ7vLvkG/ZGQAgEf0z8SANR/V8OTaQLGVzthSaqnYSIt2q0o6Jvsw9laSC7JCQRDWZzb /Cu3zDZg5RLuTx8WQzRGbw5uZ6VZnK9pIO/A3TSK3hqhBqzLeMtYk8aucCNBrCSDbgF7 2Csg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id f5si8157059plj.148.2017.06.05.13.53.37; Mon, 05 Jun 2017 13:53:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7B143780C8; Mon, 5 Jun 2017 20:53:30 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by mail.openembedded.org (Postfix) with ESMTP id 7A4EB77F90 for ; Mon, 5 Jun 2017 20:53:27 +0000 (UTC) Received: by mail-wm0-f45.google.com with SMTP id d73so33840457wma.0 for ; Mon, 05 Jun 2017 13:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=hiKtocRO+zuOa6JX5tAmbrl8fQBizifQmQMydYUQj6w=; b=ixxV08sZz+78q3Kl0psvNKVpuI0Ywz5rl3mH1oiZ8jOnTHuBidyIGl8XVTt84PqED3 hDGrERSgj+khvaK/b2zfH5u7fnhfk05R1uNqA1EppXJSQEF9lydHkKjO+kdxoYBPBUMD X6C7w3Q941CZVzKD/uql6LCP8hCPwkTSv0rRzWzwvWtB1Sjh0LecdlYHHyIP1sMUmDtS O0DYSEfx4MV8GBWjk6VD8myx3aHVMx4C50qGr7bBupvCHIX+ZV6ckOXa96dpLkk6s4tM HytCyXTC5buzExsCV6tnZmBiRBoEbzsFOSgkw2XVDSbWMdSTPfbr8Trrc64I6U+F9KPl XaBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=hiKtocRO+zuOa6JX5tAmbrl8fQBizifQmQMydYUQj6w=; b=pDGepOeaxLK0FF0ByC/cOxIbt/hD83/M1ynzLtwHKuG667ifjH6BlEPJzu0z3HamiS ifgDyRkhN0q3t+0Ifb3Fzbv65JTtzrRhyNTDsmTt4VcjdLRNBHXCnbUQzrCTWwjvoyJq uNdW329nVs0athlg4YCpW1MAuGDIiFtCm8g1Dsf7OHZouRn5zH3rpoff3cI7/k17Sq6C NsTB2XCsfzb5DH1WxkElea8mRZorPX5LnlO00B/zOXCYHbaCEzEJ/dXdBZSrlFVlKT8J 73fcRFCN8zBYg6SnqdiaUiJonLVksPkZjSyh9y2eDsWfx+qByPfQfAnHxxMJ14b6Xp+H uH6A== X-Gm-Message-State: AODbwcDWCgqkYyE54LU3PAKBSB3ZlH2oW2LpcWPfIWlzvLvJ4XXyRgtY ILS1WS07KeX3gl8rGP8= X-Received: by 10.28.30.199 with SMTP id e190mr8790811wme.96.1496696007642; Mon, 05 Jun 2017 13:53:27 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id a24sm36543835wra.17.2017.06.05.13.53.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Jun 2017 13:53:26 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 5 Jun 2017 21:53:25 +0100 Message-Id: <1496696005-28913-1-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 2.8.1 Subject: [OE-core] [PATCH] libunwind: fix build failure on MIPS X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Ross Burton --- .../libunwind/libunwind/fix-mips.patch | 134 +++++++++++++++++++++ meta/recipes-support/libunwind/libunwind_1.2.bb | 1 + 2 files changed, 135 insertions(+) create mode 100644 meta/recipes-support/libunwind/libunwind/fix-mips.patch -- 2.8.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-support/libunwind/libunwind/fix-mips.patch b/meta/recipes-support/libunwind/libunwind/fix-mips.patch new file mode 100644 index 0000000..0022237 --- /dev/null +++ b/meta/recipes-support/libunwind/libunwind/fix-mips.patch @@ -0,0 +1,134 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 5f354cb7b9c84dae006f0ebd8ad7a78d7e2aad0c Mon Sep 17 00:00:00 2001 +From: Dave Watson +Date: Wed, 25 Jan 2017 16:18:02 -0800 +Subject: [PATCH] mips/tilegx: Add missing unwind_i.h header file + +reported-by: John Knight +--- + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 5d874755..7de4c425 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -280,7 +280,7 @@ libunwind_hppa_la_SOURCES_hppa = $(libunwind_la_SOURCES_hppa_common) \ + hppa/Gresume.c hppa/Gstep.c + + # The list of files that go info libunwind and libunwind-mips: +-noinst_HEADERS += mips/init.h mips/offsets.h ++noinst_HEADERS += mips/init.h mips/offsets.h mips/unwind_i.h + libunwind_la_SOURCES_mips_common = $(libunwind_la_SOURCES_common) \ + mips/is_fpreg.c mips/regname.c + +@@ -299,7 +299,7 @@ libunwind_mips_la_SOURCES_mips = $(libunwind_la_SOURCES_mips_common) \ + mips/Gis_signal_frame.c mips/Gregs.c mips/Gresume.c mips/Gstep.c + + # The list of files that go info libunwind and libunwind-tilegx: +-noinst_HEADERS += tilegx/init.h tilegx/offsets.h ++noinst_HEADERS += tilegx/init.h tilegx/offsets.h tilegx/unwind_i.h + libunwind_la_SOURCES_tilegx_common = $(libunwind_la_SOURCES_common) \ + tilegx/is_fpreg.c tilegx/regname.c + +diff --git a/src/mips/unwind_i.h b/src/mips/unwind_i.h +new file mode 100644 +index 0000000..3382dcf +--- /dev/null ++++ b/src/mips/unwind_i.h +@@ -0,0 +1,43 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#ifndef unwind_i_h ++#define unwind_i_h ++ ++#include ++ ++#include ++ ++#include "libunwind_i.h" ++ ++#define mips_lock UNW_OBJ(lock) ++#define mips_local_resume UNW_OBJ(local_resume) ++#define mips_local_addr_space_init UNW_OBJ(local_addr_space_init) ++ ++extern int mips_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, ++ void *arg); ++ ++extern void mips_local_addr_space_init (void); ++ ++#endif /* unwind_i_h */ +diff --git a/src/tilegx/unwind_i.h b/src/tilegx/unwind_i.h +new file mode 100644 +index 0000000..aac7be3 +--- /dev/null ++++ b/src/tilegx/unwind_i.h +@@ -0,0 +1,44 @@ ++/* libunwind - a platform-independent unwind library ++ Copyright (C) 2008 CodeSourcery ++ ++This file is part of libunwind. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation the rights to use, copy, modify, merge, publish, ++distribute, sublicense, and/or sell copies of the Software, and to ++permit persons to whom the Software is furnished to do so, subject to ++the following conditions: ++ ++The above copyright notice and this permission notice shall be ++included in all copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE ++LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION ++OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ ++ ++#ifndef unwind_i_h ++#define unwind_i_h ++ ++#include ++#include ++ ++#include ++ ++#include "libunwind_i.h" ++ ++#define tilegx_local_resume UNW_OBJ(local_resume) ++#define tilegx_local_addr_space_init UNW_OBJ(local_addr_space_init) ++ ++extern int tilegx_local_resume (unw_addr_space_t as, ++ unw_cursor_t *cursor, ++ void *arg); ++ ++extern void tilegx_local_addr_space_init (void); ++ ++#endif /* unwind_i_h */ diff --git a/meta/recipes-support/libunwind/libunwind_1.2.bb b/meta/recipes-support/libunwind/libunwind_1.2.bb index a398d33..e598e40 100644 --- a/meta/recipes-support/libunwind/libunwind_1.2.bb +++ b/meta/recipes-support/libunwind/libunwind_1.2.bb @@ -11,6 +11,7 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/libunwind/libunwind-${PV file://0001-add-knobs-to-disable-enable-tests.patch \ file://0001-ppc32-Consider-ucontext-mismatches-between-glibc-and.patch \ file://libunwind-1.1-x32.patch \ + file://fix-mips.patch \ " SRC_URI_append_libc-musl = " file://musl-header-conflict.patch"