From patchwork Sun Dec 29 18:44:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 182598 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp5507087ild; Sun, 29 Dec 2019 10:46:12 -0800 (PST) X-Google-Smtp-Source: APXvYqwKqERXrwEsaG/rIShwn3TQCXm3NQjnU8VlI7J+G1P+C4ouIMk7k/PobxQdP8pLmSxjzgIe X-Received: by 2002:a17:90a:bc41:: with SMTP id t1mr41030168pjv.137.1577645172759; Sun, 29 Dec 2019 10:46:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577645172; cv=none; d=google.com; s=arc-20160816; b=Qp1Yod06813/ycLqktweiWcDu5Btigy/ARU68NCklZxRllrBSQo24LAetBhRSsVNca tkV7s6hA8YVPmCQqXgh9JLA0leDTAGZL1aOM+ko93S7xeDaWfvv3MH+xMDCPqLyVyzLD BX6dlTyyPY0+QhpOPf7hUuOtasLNvIgCq/JmFD3wEmsTCauZM0MbwI7108ecvyzKojL1 1cbnAVqF4WDMGNkG2pxqLZGjAbIsWieuhQiOdTfxaG3wIffh6hnzrWfCeiGyWpPcAlJd 3EfFFqXfsp+9rcZogg1JgLF3jknz/VxkKA7X1iFBycdKdF9vs+hUgxbWAdvb95JSPm+T VIYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=xQpcdR6USxheSbLFF9174s8Pd8X3UHR7zzcbs1phTMo=; b=R4xxgdIJpbYV5DveLju7Am6KtCE1WMiH1D5nwHwg/y6hfVDsJDaRnkYF1mpRvygxjz bxyZkqfu5iRGp6G291rrYvMSLWuJpLIxritYJFgUZuBM5+nNsvMgZhcZL5qyFvqsVH9P vdgnAacgaEXZAI63IzVAqGsx9UlL0hN07CJbx+CIGVmwywAItsAAxVEERZUePDFKArGn 1Ozb9SQ9jp/VT0A4utlp8+8w7vFBuhjUE2wwBfNjVFoFHvvmDQmF99GVRTuYPRCWPFnY ebZFlEyfq9PwHPXESQtDbpDzh6fNzXshEn50RKSiSJMhwOB7Ggh7LQ8Sg2SGEAcG4STt SOSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lZOkVkj6; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b21si36234833pls.145.2019.12.29.10.46.12; Sun, 29 Dec 2019 10:46:12 -0800 (PST) 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=@gmail.com header.s=20161025 header.b=lZOkVkj6; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E96427F95B; Sun, 29 Dec 2019 18:45:02 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by mail.openembedded.org (Postfix) with ESMTP id 4E7F67F877 for ; Sun, 29 Dec 2019 18:44:39 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id z16so17277445pfk.0 for ; Sun, 29 Dec 2019 10:44:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lJaaA7Gsw9xCvhY+EVmXh7jp+Ku3APhPo3k5znWzGRU=; b=lZOkVkj6OmoLglRYL48XC1TjRhd1EU6CX5Oat15I8yhaiWLwA2sUA1FqWNWvkxwtwn qDrNjyPaeLVblR3r2AkQPSd7yzyCJXbDXktS0De2EY7MUArtL6vjOHEhacyL7z1NJQ7f KqPsSaxhA/frKNNOt7lYGDRWW3OKpuwhSSpRO1rzGLOee4TzjAX88ULtWVZdFv/UCuY6 bd7lxW/qs3XDsxlPTn5RLTO3Akf2VBM7+ZeDZjWaVILoPs3Froeqkjdk0z226pQjPsfs SMRBtIOmlOw/hi1Iyn5BiYSn5b43/Y6RFjCaovUvYOMLk8RhYLaMDMQKXMmJf6nWBQmm ztyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lJaaA7Gsw9xCvhY+EVmXh7jp+Ku3APhPo3k5znWzGRU=; b=RIm/GOI/4lSMlK5WcWvN1UC3vxzEbUedY5XN2aRgnLHju2sldLKsWxw+lYPRZEuCTJ u3yeJeGZRcxErdJ6iqubGLhHYdrZErTCVaq+zTHy3zCJXbW4rkc6Xz+QJERccmyEz4kP ZTEdVqCF5vWfSMpp4jCs1EzHoWzHN9I8EXUAJz+yNbq00uDMCw3pK/yaSwTotk6oTOE+ cWhaG+Z+eQJ8vIAJSI9kTEh5vyozDiJHalGTlLIhlUjNE0eQfRIiUtV23++dpHX7iwvJ 5oDSLS8gGn5YPREu82Jvaln0Ltc/oXppMqQrVUoeUxydzYA9H5p0ZASuXQtzUVmNZ1z1 953Q== X-Gm-Message-State: APjAAAUujpxVfOfmBZImDLAiR5q/AlnWgTR397+8cfrLgCLVnkd0hnJe 9aofRS3guWeSQfNtcCx7Ul3micTRYDY= X-Received: by 2002:a65:420d:: with SMTP id c13mr69182187pgq.101.1577645079938; Sun, 29 Dec 2019 10:44:39 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9200:4e0::2f83]) by smtp.gmail.com with ESMTPSA id bo19sm21257085pjb.25.2019.12.29.10.44.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Dec 2019 10:44:39 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Sun, 29 Dec 2019 10:44:10 -0800 Message-Id: <20191229184415.19514-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229184415.19514-1-raj.khem@gmail.com> References: <20191229184415.19514-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [OE-core] [PATCH 14/19] valgrind: Fix build with -fno-common 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../valgrind/valgrind/s390x_vec_op_t.patch | 19 +++++++++++++++++++ .../valgrind/valgrind_3.15.0.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch -- 2.24.1 -- _______________________________________________ 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/s390x_vec_op_t.patch b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch new file mode 100644 index 0000000000..eea671da0a --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/s390x_vec_op_t.patch @@ -0,0 +1,19 @@ +s390x_vec_op_t is not needed anywhere, only elements of enum are accessed +removing it ensures that valgrind can be built with -fno-common option + +Fixes +ld: ../../VEX/libvex-amd64-linux.a(libvex_amd64_linux_a-guest_s390_helpers.o):/usr/src/debug/valgrind/3.15.0-r0/build/VEX/../../valgrind-3.15.0/VEX/priv/guest_s390_defs.h:289: multiple definition of `s390x_vec_op_t'; ../../VEX/libvexmultiarch-amd64-linux.a(libvexmultiarch_amd64_linux_a-multiarch_main_main.o):/usr/src/debug/valgrind/3.15.0-r0/build/VEX/../../valgrind-3.15.0/VEX/priv/guest_s390_defs.h:289: first defined here + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- a/VEX/priv/guest_s390_defs.h ++++ b/VEX/priv/guest_s390_defs.h +@@ -286,7 +286,7 @@ enum { + S390_VEC_OP_VFCHE = 18, + S390_VEC_OP_VFTCI = 19, + S390_VEC_OP_LAST = 20 // supposed to be the last element in enum +-} s390x_vec_op_t; ++}; + + /* Arguments of s390x_dirtyhelper_vec_op(...) which are packed into one + ULong variable. diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 63f972945d..aedaab27b3 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -40,6 +40,7 @@ SRC_URI = "https://sourceware.org/pub/valgrind/valgrind-${PV}.tar.bz2 \ file://0001-valgrind-filter_xml_frames-do-not-filter-usr.patch \ file://0002-valgrind-adjust-std_list-expected-output.patch \ file://0001-adjust-path-filter-for-2-memcheck-tests.patch \ + file://s390x_vec_op_t.patch \ " SRC_URI[md5sum] = "46e5fbdcbc3502a5976a317a0860a975" SRC_URI[sha256sum] = "417c7a9da8f60dd05698b3a7bc6002e4ef996f14c13f0ff96679a16873e78ab1"