From patchwork Fri Jul 14 18:53:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 107824 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1274215qge; Fri, 14 Jul 2017 11:53:58 -0700 (PDT) X-Received: by 10.98.29.203 with SMTP id d194mr6753718pfd.197.1500058438041; Fri, 14 Jul 2017 11:53:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500058438; cv=none; d=google.com; s=arc-20160816; b=vjjeWc8gKm8t8N+xdySRFGpl0XCVXSohaof1lf3zUidKn3Lq9BEkbqNVeHC6w35RR9 3RAUSiqcCkcItluc4Csp2GWoHdFNY7VXHudm2gjKKdqLKJf+7Nf9PKZAShJSqjYHTCp3 07597MyQhZ4bKgGmVW5URK23UdDtl30uYOu47oKylEZxRHDRjOGNEy8EoS5hsueSG0A9 nyIzk/Jxg1gtD/xtwyNijZ++dng60bY0SeYKFKBR0+WiqK3iaLHHnlxUyG6UFTUlsPfP joZI7yn8OilBlsrn6+m858C6OIvGjUUZ0/yXvyGmEpUC/2wGU9R4FeHzfpeOAs/Pkjhq zijQ== 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=9mPEyYMbamjvoM/gmsVe7uuBoa+CdSgmFA3XV9RfyEw=; b=imMzossApRFuwuFQmBzlhKZxUt8qxKARAhymhIlsNzn02vlbmia0K49GDez0xIN8DV NMuyQdeHaTaT3JSwvd73brVOvfLplVKjkNHxzfafdjgyIIIjaPyof3cBCr5Wr83NwbMj L7oxbcakY3eRDrzrXQ0OGFi4Ug6Z5n4m7sglVMTdBUMXik9ESFYTCTzMplspDO1RwCE+ ZFKihNJYjvCuI7sojDZvjZ9OUk8wUV7gQRHJuZg4ZqOGUGNWjkYzdgW9phls5x0fK3a/ 6O3ZPIttr7uWgjajIl1hEvhJwb93m/Tmnh/Yod2nfSZY5yPOYKre/55G/6ScV+L7q6pg HnjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.b=PQ3ExCUY; 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 e9si7452909pli.506.2017.07.14.11.53.57; Fri, 14 Jul 2017 11:53:58 -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 header.b=PQ3ExCUY; 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 57BDF78230; Fri, 14 Jul 2017 18:53:54 +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 A787E78225 for ; Fri, 14 Jul 2017 18:53:52 +0000 (UTC) Received: by mail-wm0-f45.google.com with SMTP id f67so30907476wmh.1 for ; Fri, 14 Jul 2017 11:53:53 -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=Lp0b1xii9CRNKaL2vftv242vY4JBxNcrk2Vlz0q+Oo8=; b=PQ3ExCUYKy156MY/UgheN2loPrQ8Ki8iIQDq2fVOvv3T/cJUbl4C+zPsnSJaE8fV9m aS3EIxdFBN3WMQaW55zSdEzzFydW8+DCocdbrNn5lXM6w1Wyasjhs18BBQXU/7YQcQp4 Dw29MdflJeTRVhkVmvrT28dVkh68ETy+9e9yrZx37kXE0q9osD9EGqrGSo+QlY0xjfcl l10CFTkaOB0Nd4YV8i34z6eeu6s+w9cln5ynG2/d7jFa/mxSqKyV5383mF5biLILeaIB rDj6aqCAS0xzj25u79UWmuCVMZS6WdKgHblK6lFa/WlfoeT+nBIu396jGbGbiAV40icQ NplA== 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=Lp0b1xii9CRNKaL2vftv242vY4JBxNcrk2Vlz0q+Oo8=; b=UImHxI5R1Is/LxBsLkjJ+xgR6DyBlzRE0+7JqBgUIVsLt8KK1vQYw9UV0nQ3Cdljgr Au88xLDMpSzTDjVRsT1iwIbOQEw3xV2LsqGIz1YZGYXMlkIgnQ3XYmDoAjtGa3gnTP7p Wkt8FTE/ISVjObRapxLAkNfISqovCsv/fqsPPcI3vRPfAPV9iuh7n4shNx3MSpYzYY/8 V6oNuSKZT4aO41di+aak90ICLE+Hboq4Z2MoHQMVlFdu3Cv5LVshzkIV3vRbU2IViS/3 1TN+N8VSdX9wyab5gP/gsFob2ZckHuTRs1Upu1Bxsb5I3Kv/LLw0gDiR+eQBH2Y8KUKy OUdA== X-Gm-Message-State: AIVw113TywSdYxUd+NsiyQpS+q+RP8lE/uMoSx9ZpkLhLQCJtP0EGMmQ eJudIm9CMPbvBtazeiQ= X-Received: by 10.28.103.198 with SMTP id b189mr3693386wmc.59.1500058432733; Fri, 14 Jul 2017 11:53:52 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id m123sm4032297wmb.3.2017.07.14.11.53.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jul 2017 11:53:51 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 14 Jul 2017 19:53:47 +0100 Message-Id: <20170714185347.32104-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] valgrind: fix ptest compilation for PowerPC 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 --- .../valgrind/valgrind/ppc-headers.patch | 87 ++++++++++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.13.0.bb | 1 + 2 files changed, 88 insertions(+) create mode 100644 meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch b/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch new file mode 100644 index 00000000000..51259db001a --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/ppc-headers.patch @@ -0,0 +1,87 @@ +Backport a patch from upstream to fix test compilation for PPC where +system headers don't get included. + +Upstream-Status: Backport +Signed-off-by: Ross Burton + +r16450 | mjw | 2017-06-16 10:33:35 +0100 (Fri, 16 Jun 2017) | 7 lines + +ppc64 doesn't compile test_isa_2_06_partx.c without VSX support + +The #ifdef HAS_VSX guard is wrongly placed. It makes the standard +include headers not be used. Causing a build failure. Fix by moving +the #ifdef HAS_VSX after the standard includes. + +Index: none/tests/ppc32/test_isa_2_06_part3.c +=================================================================== +--- a/none/tests/ppc32/test_isa_2_06_part3.c (revision 16449) ++++ b/none/tests/ppc32/test_isa_2_06_part3.c (revision 16450) +@@ -20,17 +20,18 @@ + The GNU General Public License is contained in the file COPYING. + */ + +-#ifdef HAS_VSX +- + #include + #include + #include + #include + #include +-#include + #include + #include // getopt + ++#ifdef HAS_VSX ++ ++#include ++ + #ifndef __powerpc64__ + typedef uint32_t HWord_t; + #else +Index: none/tests/ppc32/test_isa_2_06_part1.c +=================================================================== +--- a/none/tests/ppc32/test_isa_2_06_part1.c (revision 16449) ++++ b/none/tests/ppc32/test_isa_2_06_part1.c (revision 16450) +@@ -20,13 +20,14 @@ + The GNU General Public License is contained in the file COPYING. + */ + +-#ifdef HAS_VSX +- + #include + #include + #include + #include + #include ++ ++#ifdef HAS_VSX ++ + #include + + #ifndef __powerpc64__ +Index: none/tests/ppc32/test_isa_2_06_part2.c +=================================================================== +--- a/none/tests/ppc32/test_isa_2_06_part2.c (revision 16449) ++++ b/none/tests/ppc32/test_isa_2_06_part2.c (revision 16450) +@@ -20,17 +20,18 @@ + The GNU General Public License is contained in the file COPYING. + */ + +-#ifdef HAS_VSX +- + #include + #include + #include + #include + #include +-#include + #include + #include // getopt + ++#ifdef HAS_VSX ++ ++#include ++ + #ifndef __powerpc64__ + typedef uint32_t HWord_t; + #else diff --git a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb index 2ec9b9b6fc8..feab5fc1a19 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.13.0.bb @@ -36,6 +36,7 @@ SRC_URI = "ftp://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0002-memcheck-x86-Define-__THROW-if-not-defined.patch \ file://0003-tests-seg_override-Replace-__modify_ldt-with-syscall.patch \ file://link-gz-tests.patch \ + file://ppc-headers.patch \ " SRC_URI[md5sum] = "817dd08f1e8a66336b9ff206400a5369" SRC_URI[sha256sum] = "d76680ef03f00cd5e970bbdcd4e57fb1f6df7d2e2c071635ef2be74790190c3b"