From patchwork Mon Jun 12 14:59:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 103634 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp233819qgd; Mon, 12 Jun 2017 07:59:19 -0700 (PDT) X-Received: by 10.99.129.66 with SMTP id t63mr31025948pgd.28.1497279559234; Mon, 12 Jun 2017 07:59:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497279559; cv=none; d=google.com; s=arc-20160816; b=lW07H7nYcQiRi9nfoaTPBj+WqLYXli+ipFA2HChSopr3UZUop5YI4Ax4HIaqkTq+fk 5vM1svxIe6f58R+mQCuPTEXyppbK3jEb/myhcLVqYdT0+Qv2y+8V4QnkxqUPAMRprN2q Hre7jV7jH6sFj0s276UUHOKWGGNNh7Evuk8E8ZbmBlgEJd3rwk0hINMjAfpuscNcq44u QH5JOPOxsugbmyJLVbHne/b52b3KvVWE5S/sTr08KjskXa4XwmEvzxG5Qxd2MDwoUnbL 7zsMKCpki9DhLrZQXQtA5W7CijgXX0ke9wLHTsyR6dYNuAQJ6UcVB1GcMPw1/yE/PyE3 XdCg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=w5ghqe9R8uM3QcRLxDltAxCzUDZEVUkACc+ty/mk1pE=; b=s42XQuFvcFbQTZWMU7+8SZ1+m2lOI3Nj9AWt34SmvUKGly1wKs1593kxNz06M5aF/f /jbztThaRMuRuewFKNoUYrSvPDXzM/OMoNLEJf7N6V5FH8Lpz+rVPxgtaDxG1gknM5XP 2nBAhIp1IuXv2AZz/kKBzdwvoJnhUtb/msSozKjUjnOLDx01RiMX+U9ziE+H3zwnuIe1 KVt4Ro8CUxhUWaEqIKQi+oVUgII37quWimrMbz1OwnILEnxEZAehXKm3UtboC28uF9zd WeUta5cPiOVO0x9iTm+efAAkHWQ98YvZiU7KlOUbONpePsfZmfQo06+GKEBSQzI/rRAK DzRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 c124si13085794pga.342.2017.06.12.07.59.18; Mon, 12 Jun 2017 07:59:19 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id CC173782CA; Mon, 12 Jun 2017 14:59:16 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id CA26F7825B for ; Mon, 12 Jun 2017 14:59:15 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id v14so14509627pgn.1 for ; Mon, 12 Jun 2017 07:59:17 -0700 (PDT) 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; bh=vkre5/9wKHqMsIh/32oWXbD7bK/BrkMhrIQVtltOI2I=; b=pJwgRoq57zr4IdImdHZa5TE7W437jOUgPV+K8rzYVe3HXe14tDD/Ow4oPG/rZCluBP xKVh+UfeXd7BplpyKPtks1RcE/zInXFa5Lo55HqxViaADmdiTqsDoyrjYBKp4Jjrbcrn 2415l1I6vsY6iZV56e5zbmSakdKOkGkjdjFEEumnbgMmkLqeglQ9zwrsdl3VKvd66Qq6 Z4hs9kNM/6VKWhzx99qtnxnJhBwEgMDUQqW6Ps8hKSraun/xrbEseZI2P6iceBouTgxx 9ulJFVie6olXH0UMks/Ib3vlS3qb5huSHR0/IumjcPWd1upXAMjt1AEPWyBFeCnzFRmD yGfQ== 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; bh=vkre5/9wKHqMsIh/32oWXbD7bK/BrkMhrIQVtltOI2I=; b=Y43mvjcjUHYw+z2nltKmmOM9VaiI6LwXa6b6YoHyiklhw1sVQFMDbLF2jZMRzNH7JQ /llRWj0fwQusz3FykrWNp2SS6zctwywdw59mGW7/V1OWusBQWD2F6R6ibOJNsD9yXXDg rsLOpbsvGqMpcgJsRb3r6F2bSwV1mdhTICIloe8g8xsDpVOM3pX6XVJJtSnyWkPI4j03 1gAMQ/Yc0qOZnb+phoRkQsFXvwIdDrozB7BC7gR80wNQ696cO+oWub8YXHUJWao8jNAH JsTss4yLuVL1yj3BLyt+06vjqaG3UogzSYB3JLfE2zvR7cgpMaAX06kxB+O1v4VJBzRB n0/w== X-Gm-Message-State: AODbwcAOH2bS88+MfEHyCeJA/+bBeuSDtYNNItFaSrCcYjeUDYfnL7Bi fehExIxEqHQ5hQsq X-Received: by 10.99.250.69 with SMTP id g5mr57234042pgk.11.1497279556375; Mon, 12 Jun 2017 07:59:16 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::264a]) by smtp.gmail.com with ESMTPSA id i17sm20554732pgn.60.2017.06.12.07.59.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 07:59:15 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 12 Jun 2017 07:59:01 -0700 Message-Id: <76963ed7b98db24575fe3d7fc129ef9cb1ef5636.1497279306.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: References: Subject: [OE-core] [PATCH 1/7] mpg123: Upgrade to 1.25.0 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 No need to skip textrel QA for x86 as it has been fixed in 1.25.0 Signed-off-by: Khem Raj --- .../mpg123/{mpg123_1.24.0.bb => mpg123_1.25.0.bb} | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) rename meta/recipes-multimedia/mpg123/{mpg123_1.24.0.bb => mpg123_1.25.0.bb} (87%) -- 2.13.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.24.0.bb b/meta/recipes-multimedia/mpg123/mpg123_1.25.0.bb similarity index 87% rename from meta/recipes-multimedia/mpg123/mpg123_1.24.0.bb rename to meta/recipes-multimedia/mpg123/mpg123_1.25.0.bb index 587327b9ef..f86098ce20 100644 --- a/meta/recipes-multimedia/mpg123/mpg123_1.24.0.bb +++ b/meta/recipes-multimedia/mpg123/mpg123_1.25.0.bb @@ -11,9 +11,8 @@ LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3" SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2" - -SRC_URI[md5sum] = "75d62ac0cb713a7bac5af4ded4af2bb4" -SRC_URI[sha256sum] = "55fb169a7711938f5df0497d1ffe28419fbef50011dc01d00b216379e6a2256c" +SRC_URI[md5sum] = "2ffbe29c99130215b0ee7d1b11c0ea4b" +SRC_URI[sha256sum] = "552e3e1db045e00f474252917007795ac295863fc8b13891859b3382d2f24e48" inherit autotools pkgconfig @@ -42,11 +41,6 @@ EXTRA_OECONF = " \ ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \ ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \ " - -# The x86 assembler optimisations contains text relocations and there are no -# upstream plans to fix them: http://sourceforge.net/p/mpg123/bugs/168/ -INSANE_SKIP_${PN}_append_x86 = " textrel" - # Fails to build with thumb-1 (qemuarm) #| {standard input}: Assembler messages: #| {standard input}:47: Error: selected processor does not support Thumb mode `smull r5,r6,r7,r4' From patchwork Mon Jun 12 14:59:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 103635 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp233846qgd; Mon, 12 Jun 2017 07:59:23 -0700 (PDT) X-Received: by 10.98.138.143 with SMTP id o15mr33644148pfk.125.1497279562937; Mon, 12 Jun 2017 07:59:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497279562; cv=none; d=google.com; s=arc-20160816; b=ZSeQ+8nWC4HJP+sQgEwFCy3Z7K1cfhQJtuPnaxaJC5MukCwPn5oxGhkaGdtHrnWClb 9NALG/XlquOBv1Ljsu+ee37gxVMfetmCdQT94tsall0oOCzLxzHyFTbC2iaiROlS7NoM vofV2aItSj1ZPY3LSl0Zx3LPHPqIu9jHfUn5eHp4AsByaLwVhnhSM92LtDfHyhDpaAW6 mdDi7O5Hk9deiy+hdZtL3bALdLS02jG09dnFD1sAyuvqFq1FXN6qH/Mrq+XMT26YIvtc g2tZ1UvQ466uzMl1n1CwAcy5fPnUtGQWxUvFc4+nTTHKj9UYhkHTCMS/e1TYXHEJHmpB FsEg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=+iorZhEsN0Q8nhkPiISkdf1APrqFt4qTBu/wwtZKHCA=; b=pj6VXdgjW1j49rioQblvUKEZK0ukqEaXc/yMOKkXA1qy/v2+vIiL0S5Xn+d885YFQk 6OztlSRdjy+8rnMRKYiaeHwcGdRtUMzxmtChhRsbQN7cYBuY6MzFCWjitMKs2Hz4UdU3 WFdFWKE79Q0nMbPswRZ4+N6/A05gRCkoyzz4fjIKPIH7eeCW8jMgEo82Ofh226AamR8O 8qii0kZoDgdoPXApc/zbZ5Pj5CAT3JYmJqtFJRN4gNiDzFJXky//zmdZiNZwdoqnBNQ0 8p2GBLQFsp43I2F/qyT1T+bOMRfmMqm16t4hSySl5GkUybDkfFkkCRi1DH/MZMfSqBh5 KMNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 t125si13102419pgt.164.2017.06.12.07.59.22; Mon, 12 Jun 2017 07:59:22 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1CAC7782D0; Mon, 12 Jun 2017 14:59:18 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id B561C782BE for ; Mon, 12 Jun 2017 14:59:16 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id w12so6675436pfk.0 for ; Mon, 12 Jun 2017 07:59:18 -0700 (PDT) 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; bh=ocDid71Nq+4zpum/UaK0+tzEN/4DYwi6bgR8y801YdM=; b=dEbnvdd/uZ8WKYQUFLl9m5Sd8/v444Bxi8FkHvOR6MMn30bpGXyloz2Wo+UVh2gefm KToRnNo3txVdWZ+McYLS/Wa/u6M1P+IO1S5z+TAmXVGudzVYJ8f0cuLfnaj570Ia4MEH XjvoNt52tGPaUJlAjHrvSqBXqGbTjaAdSxkSf1wg7T5V5baUHhItnspP4aQBo2wqtfke macR4lU03bIfJ+1ovcwqaLCUChEHx2w8/avrUqHdZMtPru/f07f5GKuQrPmCpR0PZhW3 6osjgjcQCzg/R1yvuCIgNhfxgkJfqdapphHwqoFBMVJeM0k6oES5JiGrFFRGtn4k+5Gg gKFg== 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; bh=ocDid71Nq+4zpum/UaK0+tzEN/4DYwi6bgR8y801YdM=; b=VD/iyFPD725jxm1iILtfJ4YGBqHOTQ9sfQLZIlPALjYsOrmKfT4GbQWP+RDZQjBpKY lWiV4feR+W22azgvzj+4UXMmURksrr7xP+AnLflDtePnczov4JEZNR9AOEaqniEPerIF MzK1+vrefxIsntyebEi94v8cEN0Gp92FgECX1w71C4qvZGRPDg4w/45cOqd+tv3PO7Ks UwnDOev9WrylYXJMRU73ahg+ZIIfTsLACo1ZFzV1ey3KdQMk+01NUfRoZLER3USzZs0G Bhy8xUHEzJqKrED3TG7JCnGo9NYWJO2L1C3Egfg68uuF7+ntxLzzfoihdpxSD2Xj3yho YYXg== X-Gm-Message-State: AODbwcBsRFIMgpRf2Xn1N8YbJ1tTo+bhJoq4P7V9+w1tNVhPQwc6xany MptVqFPAgufcpuPu X-Received: by 10.84.225.2 with SMTP id t2mr57018470plj.108.1497279557889; Mon, 12 Jun 2017 07:59:17 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::264a]) by smtp.gmail.com with ESMTPSA id i17sm20554732pgn.60.2017.06.12.07.59.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 07:59:16 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 12 Jun 2017 07:59:02 -0700 Message-Id: <4ea1e150cfe603bcb845a05a681063e17b840ba1.1497279306.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: References: Subject: [OE-core] [PATCH 2/7] binutils-2.28: Update to latest on release branch 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 Drop patches to ChangeLog, they are in patch header anyway Signed-off-by: Khem Raj --- meta/recipes-devtools/binutils/binutils-2.28.inc | 2 +- .../binutils/binutils/CVE-2017-6965.patch | 15 --------------- .../binutils/binutils/CVE-2017-6966.patch | 20 -------------------- .../binutils/binutils/CVE-2017-6969.patch | 14 -------------- .../binutils/binutils/CVE-2017-6969_2.patch | 18 ------------------ .../binutils/binutils/CVE-2017-7209.patch | 14 -------------- .../binutils/binutils/CVE-2017-7210.patch | 15 --------------- 7 files changed, 1 insertion(+), 97 deletions(-) -- 2.13.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-devtools/binutils/binutils-2.28.inc b/meta/recipes-devtools/binutils/binutils-2.28.inc index 40b518bf7a..b37bb0e03a 100644 --- a/meta/recipes-devtools/binutils/binutils-2.28.inc +++ b/meta/recipes-devtools/binutils/binutils-2.28.inc @@ -18,7 +18,7 @@ BINUPV = "${@binutils_branch_version(d)}" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P\d+_(\d_?)*)" -SRCREV = "354199c7692c1bed53a2a15f0e4d531457e95f17" +SRCREV = "cb44d42ce6ef0c7a4eed7e2a3c272ac102166850" SRC_URI = "\ git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \ file://0003-gprof-add-uclibc-support-to-configure.patch \ diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-6965.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-6965.patch index 1334c9444d..6697d4bc95 100644 --- a/meta/recipes-devtools/binutils/binutils/CVE-2017-6965.patch +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-6965.patch @@ -19,21 +19,6 @@ Signed-off-by: Yuanjie Huang binutils/readelf.c | 30 +++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 5 deletions(-) -diff --git a/binutils/ChangeLog b/binutils/ChangeLog -index f21867f98c..e789a3b99b 100644 ---- a/binutils/ChangeLog -+++ b/binutils/ChangeLog -@@ -1,3 +1,10 @@ -+2017-02-13 Nick Clifton -+ -+ PR binutils/21137 -+ * readelf.c (target_specific_reloc_handling): Add end parameter. -+ Check for buffer overflow before writing relocated values. -+ (apply_relocations): Pass end to target_specific_reloc_handling. -+ - 2017-03-02 Tristan Gingold - - * configure: Regenerate. diff --git a/binutils/readelf.c b/binutils/readelf.c index b5f577f5a1..8cdaae3b8c 100644 --- a/binutils/readelf.c diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-6966.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-6966.patch index dd58df5fbf..206e493b6e 100644 --- a/meta/recipes-devtools/binutils/binutils/CVE-2017-6966.patch +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-6966.patch @@ -22,26 +22,6 @@ Signed-off-by: Yuanjie Huang binutils/readelf.c | 109 +++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 94 insertions(+), 25 deletions(-) -diff --git a/binutils/ChangeLog b/binutils/ChangeLog -index e789a3b99b..bd63c8a0d8 100644 ---- a/binutils/ChangeLog -+++ b/binutils/ChangeLog -@@ -1,5 +1,15 @@ - 2017-02-13 Nick Clifton - -+ PR binutils/21139 -+ * readelf.c (target_specific_reloc_handling): Add num_syms -+ parameter. Check for symbol table overflow before accessing -+ symbol value. If reloc pointer is NULL, discard all saved state. -+ (apply_relocations): Pass num_syms to target_specific_reloc_handling. -+ Call target_specific_reloc_handling with a NULL reloc pointer -+ after processing all of the relocs. -+ -+2017-02-13 Nick Clifton -+ - PR binutils/21137 - * readelf.c (target_specific_reloc_handling): Add end parameter. - Check for buffer overflow before writing relocated values. diff --git a/binutils/readelf.c b/binutils/readelf.c index 8cdaae3b8c..7c158c6342 100644 --- a/binutils/readelf.c diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-6969.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-6969.patch index ed5403430c..7dfa3d87c3 100644 --- a/meta/recipes-devtools/binutils/binutils/CVE-2017-6969.patch +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-6969.patch @@ -17,20 +17,6 @@ Signed-off-by: Yuanjie Huang binutils/readelf.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) -diff --git a/binutils/ChangeLog b/binutils/ChangeLog -index bd63c8a0d8..1d840b42f9 100644 ---- a/binutils/ChangeLog -+++ b/binutils/ChangeLog -@@ -1,3 +1,9 @@ -+2017-02-17 Nick Clifton -+ -+ PR binutils/21156 -+ * readelf.c (find_section_in_set): Test for invalid section -+ indicies. -+ - 2017-02-13 Nick Clifton - - PR binutils/21139 diff --git a/binutils/readelf.c b/binutils/readelf.c index 7c158c6342..4960491c5c 100644 --- a/binutils/readelf.c diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-6969_2.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-6969_2.patch index 59a5dec675..5409511a7c 100644 --- a/meta/recipes-devtools/binutils/binutils/CVE-2017-6969_2.patch +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-6969_2.patch @@ -21,24 +21,6 @@ Signed-off-by: Yuanjie Huang binutils/dwarf.c | 34 ++++++++++++++++++++-------------- 2 files changed, 30 insertions(+), 14 deletions(-) -diff --git a/binutils/ChangeLog b/binutils/ChangeLog -index 1d840b42f9..53352c1801 100644 ---- a/binutils/ChangeLog -+++ b/binutils/ChangeLog -@@ -1,3 +1,13 @@ -+2017-02-20 Nick Clifton -+ -+ PR binutils/21156 -+ * dwarf.c (cu_tu_indexes_read): Move into... -+ (load_cu_tu_indexes): ... here. Change the variable into -+ tri-state. Change the function into boolean, returning -+ false if the indicies could not be loaded. -+ (find_cu_tu_set): Return NULL if the indicies could not be -+ loaded. -+ - 2017-02-17 Nick Clifton - - PR binutils/21156 diff --git a/binutils/dwarf.c b/binutils/dwarf.c index 0184a7ab2e..6d879c9b61 100644 --- a/binutils/dwarf.c diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-7209.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-7209.patch index 2357a12836..b14441b4e3 100644 --- a/meta/recipes-devtools/binutils/binutils/CVE-2017-7209.patch +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-7209.patch @@ -16,20 +16,6 @@ Signed-off-by: Yuanjie Huang binutils/readelf.c | 16 ++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) -diff --git a/binutils/ChangeLog b/binutils/ChangeLog -index 53352c1801..cf92744c12 100644 ---- a/binutils/ChangeLog -+++ b/binutils/ChangeLog -@@ -1,3 +1,9 @@ -+2017-02-13 Nick Clifton -+ -+ PR binutils/21135 -+ * readelf.c (dump_section_as_bytes): Handle the case where -+ uncompress_section_contents returns false. -+ - 2017-02-20 Nick Clifton - - PR binutils/21156 diff --git a/binutils/readelf.c b/binutils/readelf.c index 4960491c5c..f0e7b080e8 100644 --- a/binutils/readelf.c diff --git a/meta/recipes-devtools/binutils/binutils/CVE-2017-7210.patch b/meta/recipes-devtools/binutils/binutils/CVE-2017-7210.patch index 8791792c7c..f8ad32f4f8 100644 --- a/meta/recipes-devtools/binutils/binutils/CVE-2017-7210.patch +++ b/meta/recipes-devtools/binutils/binutils/CVE-2017-7210.patch @@ -17,21 +17,6 @@ Signed-off-by: Yuanjie Huang binutils/stabs.c | 14 +++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) -diff --git a/binutils/ChangeLog b/binutils/ChangeLog -index cf92744c12..0045fbaaa6 100644 ---- a/binutils/ChangeLog -+++ b/binutils/ChangeLog -@@ -1,3 +1,10 @@ -+2017-02-14 Nick Clifton -+ -+ PR binutils/21157 -+ * stabs.c (parse_stab_enum_type): Check for corrupt NAME:VALUE -+ pairs. -+ (parse_number): Exit early if passed an empty string. -+ - 2017-02-13 Nick Clifton - - PR binutils/21135 diff --git a/binutils/stabs.c b/binutils/stabs.c index f5c5d2d8e0..5d013cc361 100644 --- a/binutils/stabs.c From patchwork Mon Jun 12 14:59:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 103636 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp233884qgd; Mon, 12 Jun 2017 07:59:27 -0700 (PDT) X-Received: by 10.98.74.211 with SMTP id c80mr55344770pfj.58.1497279567399; Mon, 12 Jun 2017 07:59:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497279567; cv=none; d=google.com; s=arc-20160816; b=dTicpDybxOJYURkeRhboIlVCgORdMpTeecu/EoOMG7J4lEYuGcy59xNvo7FnC+87Rf 9RtRaDzJ7D02Oqf4+eBWQZ0FgyjnfzCSA4ZT7f/5BgWIZ1oKyqYDsFuWs7S0n3BDynEl CjI7UosF7/AkH4aq7eTlKWm1QpPps/X8ve///T4wwRr34ZjFlYLfldp5nsNqn6/HzKBZ B5YgYV9O9Tb9Vc/b0cX/wHVKq489m7xPAgkZWQMj9uHVfhyu6kZbvtYkMCsZgpYIXCqU Xkc0DB4b64kyStFxqkGr9B1t/QU+5nrgtarcIX1xkn/dZjTJsWBxdyt31X/8LtPbFm/4 opSg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=dqtippJguBXD6H+qnjWd1VFmIAR/G3sRIsZ164fEkno=; b=gAYHOatX6TYNognX+QTrth5BONkJ3SM5BLx1BkiEm2fw/Ne6mOfqN7GNG6kE/QHzha /1KSa5stpzcYX1WATjJWp/9a3PhpK4eHguRR6QaoMb121bER1/IVByaQUGa5kSd0ZEQV Y/cZQcPh/UtiIuWUjqoIgKWPTGMcwX97EITynJcdnBEKF0MJSoXKLzB9aHvDUSOqWiCX /l9kLUoThjEgs90ESzboGwUx0pK3kRiqlRmC594XBxvadAeJTNygjweMbHdaUFWyL/r2 AYTDf6fMQKwv/5aM3p82KGzkKvOZk+1PMfOjSorgfFaKfdiBnItZYt0fLzU1Lh0+apOg 5wOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 33si2663466pla.452.2017.06.12.07.59.27; Mon, 12 Jun 2017 07:59:27 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 237FB782D6; Mon, 12 Jun 2017 14:59:20 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f178.google.com (mail-pf0-f178.google.com [209.85.192.178]) by mail.openembedded.org (Postfix) with ESMTP id 94E41782D3 for ; Mon, 12 Jun 2017 14:59:18 +0000 (UTC) Received: by mail-pf0-f178.google.com with SMTP id x63so52405297pff.3 for ; Mon, 12 Jun 2017 07:59:20 -0700 (PDT) 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; bh=LLF31kdM3ZxNOoBGLMIbn9lXAzeXpbjn18lIn67hUDM=; b=qR/mjmBbRan1GPzfQNRp7nJwzEAzb8ghi/W/hU6hdPswRjLl7mKk7AIcnu+AZWJWcQ PTo2ypj79DEYyPwp5baZGqWxL6hyH2Pa20yV0AAlQ6txS3M+6pPksZ1y8IJWUzuNTJvl Y7HD886eQQMIQdVZW3cOEepk7wv6+oMqpIBchCOYzVK8Um04bGzTst+SsedaIEW3Rvj1 6rnl3X4Hxt9p/c2Ye372CPjgZB2t+se4mSJCqr3wQ2jU3KGFA3kL6Kiwkw0hMuL0zp83 b2pDKUmFkWf03lru1kcsaNHKbNcDIa+ebnILIoHO28gh9IQEHpLDv1/C+5YpsSjN1NpW Bvlg== 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; bh=LLF31kdM3ZxNOoBGLMIbn9lXAzeXpbjn18lIn67hUDM=; b=IOuPBwK+8u6iBHZ/a02OOV5wuBDD8mw4WdfQim0kpLaxpNDyuTFai5Kf9ZcMvhQ3jI TIG8XS7WDdNHUEktmpArg79qFiYRJqWCL12LFXtrsmmc2FaPgHkHnCXctEyp7pHfNBQu V8v9y9PVTcX7oIUZaxWGidk+m2DNbhqmg6KrCOmc0nyWEVqhrjJ1Wzmd0DPEi4mkNIgI YPqXupCsna5A6QQ+KhI710Eoxd3WT/Eo/rM74bnYqjT9q9/R6YrCfSvtAh33aD2/aTsM auRWMswPE/ytQIOuNz6/5QqLAVMD4W4p8eGzhFfYSpJwxAFCvzCR6SPQ2rluOHt+HObB dovg== X-Gm-Message-State: AODbwcDgOMLZv2sm5jVJT+dTcdawWeB8G/gFlwgx48V9zaja5CbXAUUd ZLlmQQbTiSpKBX/S X-Received: by 10.84.174.3 with SMTP id q3mr56431030plb.52.1497279559276; Mon, 12 Jun 2017 07:59:19 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::264a]) by smtp.gmail.com with ESMTPSA id i17sm20554732pgn.60.2017.06.12.07.59.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 07:59:18 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 12 Jun 2017 07:59:03 -0700 Message-Id: <641a9bf59b213e6f31546db6afb4ddefa132a002.1497279306.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: References: Subject: [OE-core] [PATCH 3/7] ltp: Include stdint.h for uintptr_t 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 Fixes build with musl and upcoming glibc Signed-off-by: Khem Raj --- .../ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch | 34 ++++++++++++++++++++++ meta/recipes-extended/ltp/ltp_20170516.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch -- 2.13.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch b/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch new file mode 100644 index 0000000000..5c73be440b --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-dirtyc0w-Include-stdint.h.patch @@ -0,0 +1,34 @@ +From 1b30d8dac1a37dc0abbb3b545db2824d6489e23f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 9 Jun 2017 09:32:13 -0700 +Subject: [PATCH] dirtyc0w: Include stdint.h + +uintptr_t is defined in stdint.h + +Fixes +| dirtyc0w_child.c:76:15: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? +| lseek(mfd, (uintptr_t) map, SEEK_SET); +| ^~~~~~~~~ + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + testcases/kernel/security/dirtyc0w/dirtyc0w_child.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c +index 5328a9bc4..49abdd6ba 100644 +--- a/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c ++++ b/testcases/kernel/security/dirtyc0w/dirtyc0w_child.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + + #include "tst_safe_pthread.h" +-- +2.13.1 + diff --git a/meta/recipes-extended/ltp/ltp_20170516.bb b/meta/recipes-extended/ltp/ltp_20170516.bb index 012c43de35..31f339461f 100644 --- a/meta/recipes-extended/ltp/ltp_20170516.bb +++ b/meta/recipes-extended/ltp/ltp_20170516.bb @@ -50,6 +50,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0034-periodic_output.patch \ file://0035-fix-test_proc_kill-hang.patch \ file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \ + file://0001-dirtyc0w-Include-stdint.h.patch \ " S = "${WORKDIR}/git" From patchwork Mon Jun 12 14:59:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 103637 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp233919qgd; Mon, 12 Jun 2017 07:59:32 -0700 (PDT) X-Received: by 10.84.129.98 with SMTP id 89mr10625116plb.35.1497279572760; Mon, 12 Jun 2017 07:59:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497279572; cv=none; d=google.com; s=arc-20160816; b=CZElD8AH8V6BAScQIP6vAnGl3PxkGGQt2NgMjmEUe8pRld2eZQnajjCJlGDqhzYEEP uTF0rX/Git2ogyYSkXlpGScEXKIeuRpWh8ZF7CbXXlpXoN+Oz9aD6D1I1V76fp+J6yvi I1oMrYxB7qa3KobIKPsv3HSvN/DV0pSpnfwDcmtf905ghYUJpa5BEQFKss5KHxn/Me8W SWEX//X/SbslkHgPKSF1oBcXsOe8B2Hj4sPusmrp5Hxw+7M30aMSZftGvPI90bL/bjpy m/IDlRosPNW82tB1UwlLdWWYRCNBFjPOObvgrloZjIvpCa+LsZ+PKnVnQS+iE1BVxsQj 9VDA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=FGhwLV7eDMVbwK2QU2qOAPK3Ar7SubaoB99J17WWPIs=; b=NZmVfvU+H+sQT5fEWtbxS4ohw4ZdAJ8VdCeZDnrPus7DqYPCHA0UDYehbE+pdqJB2G rMyDNpxup+Wnh7IMAJcxwosXaaEXS4J6X4fyifp3U45RP6F1od/TwoGOOJOJuDNob5U5 c13SS0oN8mbXlJwcE/LuspRFh7ns96riQt2kRp4zniOaWVqsGefBulhVHj5hrCyerBa0 u2KqLAnHuzD3cFYv3AiUY7xw5mDvmDx1T6Upbdy1xQZ7OPldnIfLDo5o39L0Wyv1eHgO txOzrIhocPNDTWGyOEjBBCFM/d9J7UghwACecIOMjjIlboxEPw1pKvkAguzkfhrs6RtZ co7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 q61si4561965plb.210.2017.06.12.07.59.32; Mon, 12 Jun 2017 07:59:32 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 22155782E0; Mon, 12 Jun 2017 14:59:22 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id A38BC782C6 for ; Mon, 12 Jun 2017 14:59:19 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id f127so14504662pgc.2 for ; Mon, 12 Jun 2017 07:59:21 -0700 (PDT) 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; bh=yVA4fmEBY2xIKz9AOeWa32aPIVHxXFY9y8YH4kDzy60=; b=txpTfQx/YsIJdC2Xosmqlmh8geEoR8kloOJn+3kfP5R1PDRzR96RbleNG0yY2/ztYB wtUQlf5aMKFJe/wBcTZs7RCrL737AhKke0dmbJv92nhmVmlZnwqw7c92nEoclwUBAoVX 4QueUGCBguhjUhDtlFlRuTNVZqVOlJ/5Zm+iyKf0i2Ye+LUuGKFVhrKcdGAKUbSQXtys +YnsFXe+8TnaX2Fj3GJHzYUgcH+GVOVtv9/s9O3xwU/j94qrqTGS9HQFtjqXqWKWXiyM DdBTpnbcvBEk2qM9qsBH9QyqW/CSgxWrDb6HubpHr/wNfWjXMQl24PrOZxG3yjl79Tmp 0CMQ== 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; bh=yVA4fmEBY2xIKz9AOeWa32aPIVHxXFY9y8YH4kDzy60=; b=nBnPS+jVJ+jaINks5FyZ5xg83t//1/a9lx7pEo033h1CJD0rdJC85UXMUAobcjMz5t oA9ur6lZFbu6YuZ4K4uGFSoigG8+bZfzJuUZpjhu18BCdgWs9FlfzjKyjsJIYngPZs+C VkCdxLcF3XsTVvzPqDKaVpM9kdFa1ntRsE17tnklrcymkzaVNPAQllUWJ5xdfg/eiVU5 OLmUinqvbmagBJn5aVsyHnjF1BgukHgg4JQYhnHnhxB5sbxoSiA+YXo4+XOBwrWU/jPe aiZDtyGz7oPU5nTFj/XfW0fRBb5SDap9X1GK3mizMHO0HkslEX7GNc9D0DlyiNO6u9SA KdSQ== X-Gm-Message-State: AODbwcDg+4FNZCMkmhiYCWRIluVWFbFgMPk72qOU4MYFomhDaOlUiwKJ E9S6KWCad4FBIC38 X-Received: by 10.99.119.130 with SMTP id s124mr46814265pgc.33.1497279560580; Mon, 12 Jun 2017 07:59:20 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::264a]) by smtp.gmail.com with ESMTPSA id i17sm20554732pgn.60.2017.06.12.07.59.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 07:59:19 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 12 Jun 2017 07:59:04 -0700 Message-Id: <9b48a0208d92b5c6ba013f5b43218777b2349c2c.1497279306.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: References: Subject: [OE-core] [PATCH 4/7] libnsl2: Include stdint.h 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 uintptr_t is defined in stdint.h Signed-off-by: Khem Raj --- ...Include-stdint.h-for-uintptr_t-definition.patch | 27 ++++++++++++++++++++++ meta/recipes-extended/libnsl/libnsl2_git.bb | 1 + 2 files changed, 28 insertions(+) create mode 100644 meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch -- 2.13.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch b/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch new file mode 100644 index 0000000000..e9ae517107 --- /dev/null +++ b/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch @@ -0,0 +1,27 @@ +From d71cbeb3b76e54778a4d5eec6d387cce653537ca Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 9 Jun 2017 09:49:35 -0700 +Subject: [PATCH] nis_call.c: Include stdint.h for uintptr_t definition + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + src/nisplus/nis_call.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/nisplus/nis_call.c b/src/nisplus/nis_call.c +index 1a2b90c..1dc982d 100644 +--- a/src/nisplus/nis_call.c ++++ b/src/nisplus/nis_call.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.13.1 + diff --git a/meta/recipes-extended/libnsl/libnsl2_git.bb b/meta/recipes-extended/libnsl/libnsl2_git.bb index 1698f69edb..18e37a1ac9 100644 --- a/meta/recipes-extended/libnsl/libnsl2_git.bb +++ b/meta/recipes-extended/libnsl/libnsl2_git.bb @@ -18,6 +18,7 @@ SRCREV = "dfa2f313524aff9243c4d8ce1bace73786478356" SRC_URI = "git://github.com/thkukuk/libnsl \ file://0001-include-sys-cdefs.h-explicitly.patch \ file://0002-Define-glibc-specific-macros.patch \ + file://0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch \ " S = "${WORKDIR}/git" From patchwork Mon Jun 12 14:59:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 103638 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp233962qgd; Mon, 12 Jun 2017 07:59:38 -0700 (PDT) X-Received: by 10.99.168.67 with SMTP id i3mr32427139pgp.23.1497279578464; Mon, 12 Jun 2017 07:59:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497279578; cv=none; d=google.com; s=arc-20160816; b=Xq0GV1N2/pcQLRGMh2U7I1EA4xEA5GRL91dpBG5QGE28f0MHTj4Ojw9q+w6ahAsUaz S5a1t/hC3CSI586fp0Svy8zMKnPTvuQMPQ5zqYPdFh5cLT+pas2Devzh4W0XzrLIjD6p ZPRuOalVwsLF+rSxz2oFMJpogT6txPcUlitax3sR9EokLkUyZGHRsngW6Yiw+j7W3thS zrYU/nhbM5DZ1/JkvF6CsK3FQmqVGtkVSsnYpKI8JahNYAFyfHvaCQi93K5QkoOSkak+ 1QCaSl6UJsLMlXvPAP8xWklnTcS+rFyWFg1WC8dgvHqaehxnFBOBEetMqUFj5S4ciGYr n4Uw== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=25tuQuqriEmWZ1++/wytthbDf0PPh3Xz24VGMaiJpL0=; b=QU8iEM0/ar6vRJmSZBpJgfOtuOigNxAUzjuO2W+om7RAaWuPJYR9ZYy7WNk3NDrB8u H2C/+hJmttp2jZe9Q8OzJ4lDr+oB+qKGZ+6ya5BNJtqJX3qs9RgeIh03LFw52fzODOXl iXHKNKidaIeDYSpT5Ro8H1UvJ/TdxzDoOOHgqn7rqan2tGTFB14ZzyfXSCAo6vQ7Ur1T KI7dCo/yRtxZ9+hFZUQs6Z2tUHR5RvDBa9mNUooWIwGHeJCtSD56Kb/QU4iQjaGQEnWf A190jddRGTATYOv67QEEMzH0Cmm/7/0uU0K+2uWA53in0MfyiDl7CBgdN7+4h4Zz6fpX aevQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 b1si7103327pld.97.2017.06.12.07.59.38; Mon, 12 Jun 2017 07:59:38 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 241EF782E8; Mon, 12 Jun 2017 14:59:23 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com [209.85.192.171]) by mail.openembedded.org (Postfix) with ESMTP id 1AB63782CD for ; Mon, 12 Jun 2017 14:59:20 +0000 (UTC) Received: by mail-pf0-f171.google.com with SMTP id l89so52442015pfi.2 for ; Mon, 12 Jun 2017 07:59:22 -0700 (PDT) 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; bh=VwkHCBr4i/CHhYSy8+pM+6068CWtTrSQfgBzkWNPSb4=; b=LRnl4tP8d7TsgeQ4A7dxY9/Nq7hkIysQxUct14khbnUPJ4Gv9Al0JfLzN5dnrFJAB3 V4kq/5g3jj3WkSz2eDoDA0TwRui0vk0NlVqQGxjElSc4sUWsMYSOde4LaokaxgXl3ZgQ fbvgQUZtriGNJEVuq0ochm4yWQU88Ulx1wOiLiO6Zi6Wa25kib38y7tJ+fLoChVKksXr iFq7kBfHlVsHViWFvOydV5+GacUVYcm7NlqMtBItQH8EY77cIVWMWwW3nUn4JxuJaMLV 2QpZaluF/dCOLAKwA4vwEnzrHykDl4vILplC8EQZTIJZoDTd8cOZFLx4Yrnw/rFdwltC 2VtQ== 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; bh=VwkHCBr4i/CHhYSy8+pM+6068CWtTrSQfgBzkWNPSb4=; b=IDK3vO8gODjgwu/5yxFe70SccjrQXsYmjSGUOTDgRxWgW9W32h2/0VlUHnBO6FQ1Lt 9Ye5yhMe9gTbvOTDTL+onYnMdKE9g7oPtLrRNvwcImH9/vjgsIE/YRsQNONw3ig0IbVe 1y6vc57nBSGYMYegw47wy1j15Dw8nSiQFBVXvVKTJ5IKIsptMrAuPulNLIEiiU0GDFJv CByOo2/dkU0miu5Qf7/iKe5LcOR4p2+hP/5NHHU0vuSUYasXYSGVEB0VEdjFuEn9JTi7 mI2fEFF8OoAF+lSTgfrCEhznR9lzk7rPi90do+ueYHXAF5+ahgpWT/cJMOuMcxKQl1yq sSmw== X-Gm-Message-State: AODbwcAFT9zkHAJktx2Bhbd4XOZdsFsI6rlBOb78H2BX7e5KiupURDdX 4f90ZB6OTchbNsIe X-Received: by 10.84.224.1 with SMTP id r1mr58335205plj.262.1497279561891; Mon, 12 Jun 2017 07:59:21 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::264a]) by smtp.gmail.com with ESMTPSA id i17sm20554732pgn.60.2017.06.12.07.59.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 07:59:21 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 12 Jun 2017 07:59:05 -0700 Message-Id: <3046a1a8ef89c895f332b829097a1c650bdfac48.1497279306.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: References: Subject: [OE-core] [PATCH 5/7] valgrind: Fix ptest build with musl 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 musl unearthed a problem when building out of tree, config.h was being used from $(srcdir) instead of generated config.h in $(builddir) this assumed functions e.g. mallinfo() and more which are not in musl as a result tests broke. Also add fixes to build remaining tests when building on musl pass -fno-pie as it cant use PIE especially in ptests/x86_64 Signed-off-by: Khem Raj --- ...e-Rename-_sifields-to-__si_fields-on-musl.patch | 31 ++++++++++++++ ...tr_tester.c-Limit-rawmemchr-test-to-glibc.patch | 39 +++++++++++++++++ ...02-context-APIs-are-not-available-on-musl.patch | 49 ++++++++++++++++++++++ ...rrect-include-directive-path-for-config.h.patch | 45 ++++++++++++++++++++ ...4-pth_atfork1.c-Define-error-API-for-musl.patch | 37 ++++++++++++++++ ...erifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch | 30 +++++++++++++ ...d3.c-Dereference-pthread_t-before-adding-.patch | 32 ++++++++++++++ meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 12 ++++++ 8 files changed, 275 insertions(+) create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch create mode 100644 meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch create mode 100644 meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch create mode 100644 meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch create mode 100644 meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch create mode 100644 meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch create mode 100644 meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch -- 2.13.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/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch b/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch new file mode 100644 index 0000000000..27366153f7 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch @@ -0,0 +1,31 @@ +From 64ad2744acfb4fa40b1c114633a053f87125a203 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 10 Jun 2017 00:46:39 -0700 +Subject: [PATCH 1/6] sigqueue: Rename _sifields to __si_fields on musl + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + memcheck/tests/linux/sigqueue.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/memcheck/tests/linux/sigqueue.c b/memcheck/tests/linux/sigqueue.c +index d18bd72..acb7cba 100644 +--- a/memcheck/tests/linux/sigqueue.c ++++ b/memcheck/tests/linux/sigqueue.c +@@ -8,6 +8,11 @@ + #include + #include + ++/* musl libc defines siginfo_t __si_fields instead of _sifields */ ++#if defined(__linux__) && !defined(__GLIBC__) ++#define _sifields __si_fields ++#endif ++ + int main(int argc, char **argv) + { + siginfo_t *si; +-- +2.13.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch b/meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch new file mode 100644 index 0000000000..185b8f9e60 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch @@ -0,0 +1,39 @@ +From de692e359801a1f0488c76267e4f904dd2efe754 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 10 Jun 2017 00:39:07 -0700 +Subject: [PATCH] str_tester.c: Limit rawmemchr() test to glibc + +rawmemchr() is a GNU extention therefore mark it so + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + memcheck/tests/str_tester.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/memcheck/tests/str_tester.c b/memcheck/tests/str_tester.c +index 9f7790a..47e4b4a 100644 +--- a/memcheck/tests/str_tester.c ++++ b/memcheck/tests/str_tester.c +@@ -504,7 +504,7 @@ test_strchrnul (void) + #endif + + // DDD: better done by testing for the function. +-#if !defined(__APPLE__) && !defined(__sun) ++#if !defined(__APPLE__) && !defined(__sun) && defined(__GLIBC__) + static void + test_rawmemchr (void) + { +@@ -1442,7 +1442,7 @@ main (void) + test_strchrnul (); + # endif + +-# if !defined(__APPLE__) && !defined(__sun) ++# if !defined(__APPLE__) && !defined(__sun) && defined(__GLIBC__) + /* rawmemchr. */ + test_rawmemchr (); + # endif +-- +2.13.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch b/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch new file mode 100644 index 0000000000..3f9f33b487 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0002-context-APIs-are-not-available-on-musl.patch @@ -0,0 +1,49 @@ +From 862b807076d57f2f58ed9d572ddac8bb402774a2 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 10 Jun 2017 01:01:10 -0700 +Subject: [PATCH 2/6] context APIs are not available on musl + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + memcheck/tests/linux/stack_changes.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/memcheck/tests/linux/stack_changes.c b/memcheck/tests/linux/stack_changes.c +index a978fc2..ffb49c6 100644 +--- a/memcheck/tests/linux/stack_changes.c ++++ b/memcheck/tests/linux/stack_changes.c +@@ -10,6 +10,7 @@ + // This test is checking the libc context calls (setcontext, etc.) and + // checks that Valgrind notices their stack changes properly. + ++#ifdef __GLIBC__ + typedef struct ucontext mycontext; + + mycontext ctx1, ctx2, oldc; +@@ -51,9 +52,11 @@ int init_context(mycontext *uc) + + return ret; + } ++#endif + + int main(int argc, char **argv) + { ++#ifdef __GLIBC__ + int c1 = init_context(&ctx1); + int c2 = init_context(&ctx2); + +@@ -66,6 +69,8 @@ int main(int argc, char **argv) + //free(ctx1.uc_stack.ss_sp); + VALGRIND_STACK_DEREGISTER(c2); + //free(ctx2.uc_stack.ss_sp); +- ++#else ++ printf("libc context call APIs e.g. getcontext() are deprecated by posix\n"); ++#endif + return 0; + } +-- +2.13.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch b/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch new file mode 100644 index 0000000000..c2965c40df --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0003-correct-include-directive-path-for-config.h.patch @@ -0,0 +1,45 @@ +From ecbdea7bd8b08205f1bc3f6b72d4b4a80f313fcb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 10 Jun 2017 01:03:17 -0700 +Subject: [PATCH 3/6] correct include directive path for config.h + +when building out of source tree, it can not find +the generated config.h otherwise + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + memcheck/tests/linux/syscalls-2007.c | 2 +- + memcheck/tests/linux/syslog-syscall.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/memcheck/tests/linux/syscalls-2007.c b/memcheck/tests/linux/syscalls-2007.c +index b61c6d5..cc3fd62 100644 +--- a/memcheck/tests/linux/syscalls-2007.c ++++ b/memcheck/tests/linux/syscalls-2007.c +@@ -10,7 +10,7 @@ + + #define _GNU_SOURCE + +-#include "../../config.h" ++#include "config.h" + #include + #include + #include +diff --git a/memcheck/tests/linux/syslog-syscall.c b/memcheck/tests/linux/syslog-syscall.c +index 1143722..21e758b 100644 +--- a/memcheck/tests/linux/syslog-syscall.c ++++ b/memcheck/tests/linux/syslog-syscall.c +@@ -6,7 +6,7 @@ + * klogctl(). + */ + +-#include "../../config.h" ++#include "config.h" + #include + #if defined(HAVE_SYS_KLOG_H) + #include +-- +2.13.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch b/meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch new file mode 100644 index 0000000000..1cb7062545 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0004-pth_atfork1.c-Define-error-API-for-musl.patch @@ -0,0 +1,37 @@ +From fb77fef4f866dac7bcc6d1ae025da60564869f84 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 10 Jun 2017 01:06:11 -0700 +Subject: [PATCH 4/6] pth_atfork1.c: Define error() API for musl + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + none/tests/pth_atfork1.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/none/tests/pth_atfork1.c b/none/tests/pth_atfork1.c +index 34201ef..b7f5f2d 100644 +--- a/none/tests/pth_atfork1.c ++++ b/none/tests/pth_atfork1.c +@@ -18,7 +18,7 @@ + Boston, MA 02111-1307, USA. */ + + #include +-#if !defined(__APPLE__) && !defined(__sun) ++#if !defined(__APPLE__) && !defined(__sun) && defined(__GLIBC__) + # include + #endif + #include +@@ -27,7 +27,7 @@ + #include + #include + +-#if defined(__APPLE__) || defined(__sun) ++#if defined(__APPLE__) || defined(__sun) || (defined(__linux__) && !defined(__GLIBC__)) + #include /* strerror */ + static void error (int status, int errnum, char* msg) + { +-- +2.13.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch b/meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch new file mode 100644 index 0000000000..6176640e42 --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch @@ -0,0 +1,30 @@ +From b4b9f072c22f96844e02cb9d68f7ff2408680817 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 10 Jun 2017 01:07:59 -0700 +Subject: [PATCH 5/6] tc20_verifywrap.c: Fake __GLIBC_PREREQ with musl + +similar to sun + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + helgrind/tests/tc20_verifywrap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/helgrind/tests/tc20_verifywrap.c b/helgrind/tests/tc20_verifywrap.c +index c110000..a311a49 100644 +--- a/helgrind/tests/tc20_verifywrap.c ++++ b/helgrind/tests/tc20_verifywrap.c +@@ -20,7 +20,7 @@ + + #if !defined(__APPLE__) + +-#if defined(__sun__) ++#if defined(__sun__) || (defined(__linux__) && !defined(__GLIBC__)) + /* Fake __GLIBC_PREREQ on Solaris. Pretend glibc >= 2.4. */ + # define __GLIBC_PREREQ + #else +-- +2.13.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch b/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch new file mode 100644 index 0000000000..05886c743d --- /dev/null +++ b/meta/recipes-devtools/valgrind/valgrind/0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch @@ -0,0 +1,32 @@ +From a6547fc17c120dbd95b852f50b0c4bdee4fedb9a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 10 Jun 2017 01:20:32 -0700 +Subject: [PATCH 6/6] pth_detached3.c: Dereference pthread_t before adding + offset to it + +Fixes +error: invalid use of undefined type 'struct __pthread' + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + drd/tests/pth_detached3.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drd/tests/pth_detached3.c b/drd/tests/pth_detached3.c +index c02eef1..35d43a6 100644 +--- a/drd/tests/pth_detached3.c ++++ b/drd/tests/pth_detached3.c +@@ -21,7 +21,7 @@ int main(int argc, char** argv) + pthread_detach(thread); + + /* Invoke pthread_detach() with an invalid thread ID. */ +- pthread_detach(thread + 8); ++ pthread_detach((pthread_t*)(&thread + 8)); + + fprintf(stderr, "Finished.\n"); + +-- +2.13.1 + diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb index d5a8dda487..d7b6d77000 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb @@ -24,6 +24,13 @@ SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ file://avoid-neon-for-targets-which-don-t-support-it.patch \ file://valgrind-make-ld-XXX.so-strlen-intercept-optional.patch \ file://0001-makefiles-Drop-setting-mcpu-to-cortex-a8-on-arm-arch.patch \ + file://0001-str_tester.c-Limit-rawmemchr-test-to-glibc.patch \ + file://0001-sigqueue-Rename-_sifields-to-__si_fields-on-musl.patch \ + file://0002-context-APIs-are-not-available-on-musl.patch \ + file://0003-correct-include-directive-path-for-config.h.patch \ + file://0004-pth_atfork1.c-Define-error-API-for-musl.patch \ + file://0005-tc20_verifywrap.c-Fake-__GLIBC_PREREQ-with-musl.patch \ + file://0006-pth_detached3.c-Dereference-pthread_t-before-adding-.patch \ " SRC_URI_append_libc-musl = "\ file://0001-fix-build-for-musl-targets.patch \ @@ -67,6 +74,7 @@ CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" SELECTED_OPTIMIZATION = "${DEBUG_FLAGS}" CFLAGS_append_libc-uclibc = " -D__UCLIBC__ " +CFLAGS += "-no-pie" def get_mcpu(d): for arg in (d.getVar('TUNE_CCARGS') or '').split(): @@ -76,6 +84,10 @@ def get_mcpu(d): continue return "" +do_configure_prepend () { + rm -rf ${S}/config.h +} + do_install_append () { install -m 644 ${B}/default.supp ${D}/${libdir}/valgrind/ } From patchwork Mon Jun 12 14:59:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 103639 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp234008qgd; Mon, 12 Jun 2017 07:59:45 -0700 (PDT) X-Received: by 10.98.223.131 with SMTP id d3mr36077531pfl.112.1497279585616; Mon, 12 Jun 2017 07:59:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497279585; cv=none; d=google.com; s=arc-20160816; b=IJ4Zo5RXb4ABDyjEStzLEwSXwWS/YSTkSQ0mZXY0PJgDZu8i5LKPCshCKMZaR5S5+v IXrSYVvwV/O9OOhT0DSmOl0NMSXU4QiW0f859d1cS8sM0EALeIVNdaQKcEf1bpo3btiv Xagr0BqDmUg/uz1bLtGZOPD7qZBqmPrh06NDVIBav4uuFUed3L3TKraVJF7RaRkb/lrY S1WYsECFaZVIu+gqYKEJdcwJV6GKHpo68wVD+A8/lekRuNCfHIKWMr/uOwia5YuLydBn +Ww0CNyIWGXYTzPWPsdp6NGe3fQ+4wnfA+/hnrR6aD39JgR00y1okYeahqOCc9cQCAgR J1eA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=v8z1C3LJWE+9EO1ayaJt0jlS1jbynJh9oBEI+MvKUww=; b=rlxtTNSfLokls2uOiSbf1X+xtyowXqpwBV29F3FhDpvi/8V2Qqzxf2zaOvX3jz7vZ+ BqURmZAV8sDCCd83vqjnbiUyN5rTPID8zYBCfaqkrm5GbsiVQVY+6ZS2a6KIC9H/MbFd GGOuM6g26KNDwaAAbhvayrnv07hrb5ENyUB8zoPg2MtTb0TXrfNj0aUhnSnL9PqAR07H SqdcaBdbslQwoTIYYnxddKiBQWxC07vE8D9hT3YVH3//QAyqGhzI6E9P0WiUGVsaxv16 EbzjioJSgnJngBJ0rQDBe98U+Y+GAuYZb9y+XNaYAX/FS0srgW07rC8Ql/bU77qd5+bj uzPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 o6si13316604pgq.23.2017.06.12.07.59.45; Mon, 12 Jun 2017 07:59:45 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 18741782EE; Mon, 12 Jun 2017 14:59:26 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id 1BAAB782CC for ; Mon, 12 Jun 2017 14:59:22 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id d5so4440439pfe.1 for ; Mon, 12 Jun 2017 07:59:23 -0700 (PDT) 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; bh=OWvhpOB5HIPl+OzYF+lskcP3LmD82Y2qhpxIw2RiyHs=; b=UEKckg2+VPFaNUA6XTk/3hVRT24c2iaZoQzxHTrQsv5CV8KIxag8D1aLw7S9+lM2S5 hrjLZOa7GepFkLNtO7mwjY9VZmdVggGED0cWTUGezmETT2LCXqyybRL+rLDEicqPbHSL bB6OZqbbwk8WQUcQ3PrlYXO0rO50q9tukGxRU0ui3E+dT2drpOcrV/THzSTPJ7AOrCov Lazfq4JgwcYkXo1a9V/WsbWq9n029+ny25oI0d2Fg5k4FIZ+tohtkEU1JfDzDCmjlWP8 xDtJKjurE2l8O411mL9LfUPhmiXIaQNlsAXXc+QLUpHc9Y5rCW/pqigQkIYDSIznIhJL YMNQ== 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; bh=OWvhpOB5HIPl+OzYF+lskcP3LmD82Y2qhpxIw2RiyHs=; b=e12Bp0ecbnlfREiOLwOs29OilISwQvEiRPZNPlHO5MALuriolA1y713GBuuWl7xFYU Nha0npzGFqGU+FS1zdkj4Kuw8d5vxP12CuY+gnR6gJf9f1qTsq/ujhkgZ45ej9IJ1K8I FUWf8LBhmd9HJO9bVCof0EIIYuobJXf/eP5tFDFYCLPGIbMygjBbbYrDpVz2Z1b2XHuJ 1ILIAHn8TIs+PLGZdh2FWEI/Db584hospdYUOl7eoVMEj6XTteVNuC9ucxK8ZJNUg5ZN VzKsmhQCh0OgOIp9Cj3MvlAxxOWcx9ahLKsDZ05hiWKaQ60FTaiEGb8MrGzpjbHQmzJj zi2g== X-Gm-Message-State: AODbwcC9X4ntrKB+HkSzWDGqPhC+M9Pa6hvwEg3j5g46iZxh7c7MAd7B 5cFixce1T4wF4TLg X-Received: by 10.84.231.141 with SMTP id g13mr57001641plk.157.1497279563364; Mon, 12 Jun 2017 07:59:23 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::264a]) by smtp.gmail.com with ESMTPSA id i17sm20554732pgn.60.2017.06.12.07.59.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 07:59:22 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 12 Jun 2017 07:59:06 -0700 Message-Id: <59ea0b6f571b51c8ee406236948eae3efeb2daad.1497279306.git.raj.khem@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: References: Subject: [OE-core] [PATCH 6/7] kexec-tools: Pass -no-pie to linker 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 - This matches the linker flags to compiler flags in purgatory - Compile arm64 without PIC Signed-off-by: Khem Raj --- .../kexec-tools/0001-Disable-PIE-during-link.patch | 31 ++++++++++++++++++++++ .../kexec/kexec-tools/0001-arm64-Disable-PIC.patch | 31 ++++++++++++++++++++++ meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb | 2 ++ 3 files changed, 64 insertions(+) create mode 100644 meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch create mode 100644 meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch -- 2.13.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch new file mode 100644 index 0000000000..3f2f85e337 --- /dev/null +++ b/meta/recipes-kernel/kexec/kexec-tools/0001-Disable-PIE-during-link.patch @@ -0,0 +1,31 @@ +From ea7be6d71b85880e8e8a2c8a4f49a696c5f31ae4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 10 Jun 2017 11:18:49 -0700 +Subject: [PATCH] Disable PIE during link + +We have explcitly disabled PIE during compile so we +just need to match it with linker flags + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + purgatory/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/purgatory/Makefile b/purgatory/Makefile +index 564bdb7..a08e41f 100644 +--- a/purgatory/Makefile ++++ b/purgatory/Makefile +@@ -59,7 +59,7 @@ $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ + -Iinclude \ + -I$(shell $(CC) -print-file-name=include) + $(PURGATORY): LDFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS)\ +- -Wl,--no-undefined -nostartfiles -nostdlib \ ++ -Wl,--no-undefined -no-pie -nostartfiles -nostdlib \ + -nodefaultlibs -e purgatory_start -Wl,-r \ + -Wl,-Map=$(PURGATORY_MAP) + +-- +2.13.1 + diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch new file mode 100644 index 0000000000..84e94d7d93 --- /dev/null +++ b/meta/recipes-kernel/kexec/kexec-tools/0001-arm64-Disable-PIC.patch @@ -0,0 +1,31 @@ +From 3bb73e5e5649b455e15d5ca3a7ad1a90c4960972 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 10 Jun 2017 11:54:36 -0700 +Subject: [PATCH] arm64: Disable PIC + +Fix +| cc1: sorry, unimplemented: code model 'large' with -fPIC +| make: *** [Makefile:118: purgatory/arch/arm64/entry.o] Error 1 + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + purgatory/arch/arm64/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/purgatory/arch/arm64/Makefile b/purgatory/arch/arm64/Makefile +index 636abea..80068ca 100644 +--- a/purgatory/arch/arm64/Makefile ++++ b/purgatory/arch/arm64/Makefile +@@ -1,6 +1,7 @@ + + arm64_PURGATORY_EXTRA_CFLAGS = \ + -mcmodel=large \ ++ -fno-PIC \ + -fno-stack-protector \ + -fno-asynchronous-unwind-tables \ + -Wundef \ +-- +2.13.1 + diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb index 90d5985801..4caca933c7 100644 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.14.bb @@ -19,6 +19,8 @@ SRC_URI += "${KERNELORG_MIRROR}/linux/utils/kernel/kexec/kexec-tools-${PV}.tar.g file://0001-x86-x86_64-Fix-format-warning-with-die.patch \ file://0002-ppc-Fix-format-warning-with-die.patch \ file://kexec-x32.patch \ + file://0001-Disable-PIE-during-link.patch \ + file://0001-arm64-Disable-PIC.patch \ " SRC_URI[md5sum] = "b2b2c5e6b29d467d6e99d587fb6b7cf5" From patchwork Mon Jun 12 14:59:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 103641 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp234047qgd; Mon, 12 Jun 2017 07:59:50 -0700 (PDT) X-Received: by 10.98.150.199 with SMTP id s68mr37685815pfk.206.1497279590744; Mon, 12 Jun 2017 07:59:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497279590; cv=none; d=google.com; s=arc-20160816; b=tKoFFod8TcRbHTbVfjcah1x2m/elQiw87ktqkOejFmvWxLjOjQo0DrSwwlk89e0vDg twTIfdzHNqV1LmhUej8TxcU241g7ry6gT36fHxgnJ4+Vb64xdJpQaZweQXDHy7SXyyqm PYz6Ai/+AT4s0wZMRK4xKEJOiXo7V0/czNaqRmWAxDLhA/9SEcX8+uTwcODP0bprb5fm 06tosG4ppfTVEFV9WM0XL5wICe0J0Zm5K/TU67S9N5OQrkwtg+gfWqi37g9Md5RUaYMY 8h74Kg5fscd+AWhnfGFPJaaiiMdP1qTJLamWjTt3h9xfn4peSAEWbmv8HUlCMLPIP9dV GVUQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=QahJW3/BpzJVpuUnqh0bC2J1fh0+R5MIoWyJ29IpNG0=; b=iFw0vKTr7ELw6Y4ZAggwzvkrSwHN45N1pCDXtJ9WOfYSC8YrZd6xGe8qutunQndskA 9TMGTUpv4I5G9cp1I1lgXA4W45afug6N6YN+udc5Iagn/zY0qaO6a/hZNmWriH+pw2DA dcvHGRJ2jH99t5fKCIEoNsPCLT0W7WSu0VF7EsACw9hPSM8+dz+ipXbTVm/0vEGWB96n 0EMJA4L3zHDZZLC63MXX9ROnd7UzF4Q3bbJKnyKjDPPvhS6gBcQEoe1gAiO60p320X8C vvMiqAVyfnpD7COmgSA3aSJjuhe4irAp+QYLZyn+FMIpaGvC/YAZu+Zdd8vIjbVPUi/l jaQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 63si13186581pgc.384.2017.06.12.07.59.50; Mon, 12 Jun 2017 07:59:50 -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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 1EBEE782D1; Mon, 12 Jun 2017 14:59:27 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg0-f44.google.com (mail-pg0-f44.google.com [74.125.83.44]) by mail.openembedded.org (Postfix) with ESMTP id 0E115782D1 for ; Mon, 12 Jun 2017 14:59:23 +0000 (UTC) Received: by mail-pg0-f44.google.com with SMTP id a70so46228425pge.3 for ; Mon, 12 Jun 2017 07:59:25 -0700 (PDT) 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; bh=ixkqXKy9HSTYJF/zv6+ovYm2PZbkCermSdpK2u50ly0=; b=tPRUu30jZsA4JjiZJpi1i5Z8hwfgM/JiDGUA+YlrwP2MepSMFNunpiv2XE0PX+AoB3 FTkaIAUPJQIRQqgfhE0RN8IzDk5Po671hi+fBhcbCJt1EOZNRWH+xSe1XaNqo4n0HB2l CdxUkZSaMUUOZklQxuUdRHCPp5ItwCfspmOSLjeN0zZORlQLZPTWPkI2Dintc0Npetbg 4x2ePSpu35+orInwhxPkoaz46s8aq1lUIQF7T1Ee+hgSAubQYW5SZ5kc8gBCeh6Nsyjy N5CZ/5IZrllbvbFPrnEPGcjfELQ21SIL4039+m1ZMu2362mVsJja+RuFOAdWOR198/DA RhPg== 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; bh=ixkqXKy9HSTYJF/zv6+ovYm2PZbkCermSdpK2u50ly0=; b=EfsQfBb/bBmscjr2HtjLSZ03YoO3B21LbhkJdvcdWOfg10bhnXgS9TmOTcgsWRu0lU PFAbUaxAha2aoZ2Ok+ooq5zT6L1xry9zTJRUUUZNhbKoVV4tvTmrKuRN/NyFL2wsDBoU PCZxnDEuHDoaP608Yye7mgKRTRbkMIBmWQ91BiWoIRsaC+bggEKX7TgVgwP1/bv6qYqR /cgVbo6gPBKafbBsiU6q0AOSXTMKxjeNrwNIXdjvx/lJzJymzkld33X8ssfWfWudsXzX 8V1Gt91GkLpfMmkGtSFJwA6GPAwu12EeRl3S8P3nml4dr34mRiILUAptMBDBvoCC+chc auEw== X-Gm-Message-State: AODbwcBntA0eaqAaALsH+RCHxChSOdbHlSr9KOVpnynfGY8kSHod01BT /PtV3J7jmwZFdTqt X-Received: by 10.84.236.14 with SMTP id q14mr57906520plk.253.1497279564788; Mon, 12 Jun 2017 07:59:24 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::264a]) by smtp.gmail.com with ESMTPSA id i17sm20554732pgn.60.2017.06.12.07.59.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 07:59:23 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Mon, 12 Jun 2017 07:59:07 -0700 Message-Id: X-Mailer: git-send-email 2.13.1 In-Reply-To: References: Subject: [OE-core] [PATCH 7/7] ovmf: Update to latest 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 Fix build with gcc7 clang can not compile it therefore mark it gcc only recipe Signed-off-by: Khem Raj --- ...g-UefiHiiLib-Fix-incorrect-comparison-exp.patch | 45 ---------------------- .../ovmf/ovmf/0001-ia32-Dont-use-pie.patch | 37 ++++++++++++++++++ ...makefile-adjust-to-build-in-under-bitbake.patch | 25 ++++++------ .../ovmf/ovmf/no-stack-protector-all-archs.patch | 19 +++++++++ meta/recipes-core/ovmf/ovmf_git.bb | 6 ++- 5 files changed, 72 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch create mode 100644 meta/recipes-core/ovmf/ovmf/0001-ia32-Dont-use-pie.patch create mode 100644 meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch -- 2.13.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch b/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch deleted file mode 100644 index 0529a27b16..0000000000 --- a/meta/recipes-core/ovmf/ovmf/0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 73692710d50da1f421b0e6ddff784ca3135389b3 Mon Sep 17 00:00:00 2001 -From: Dandan Bi -Date: Sat, 1 Apr 2017 10:31:14 +0800 -Subject: [PATCH] MdeModulePkg/UefiHiiLib:Fix incorrect comparison expression - -Fix the incorrect comparison between pointer and constant zero character. - -https://bugzilla.tianocore.org/show_bug.cgi?id=416 - -V2: The pointer StringPtr points to a string returned -by ExtractConfig/ExportConfig, if it is NULL, function -InternalHiiIfrValueAction will return FALSE. So in -current usage model, the StringPtr can not be NULL before -using it, so we can add ASSERT here. - -Cc: Eric Dong -Cc: Liming Gao -Contributed-under: TianoCore Contribution Agreement 1.0 -Signed-off-by: Dandan Bi -Reviewed-by: Eric Dong ---- -Upstream-Status: Backport - - MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c -index 8579501..46ca7bc 100644 ---- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c -+++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c -@@ -2180,8 +2180,9 @@ InternalHiiIfrValueAction ( - } - - StringPtr = ConfigAltResp; -- -- while (StringPtr != L'\0') { -+ ASSERT (StringPtr != NULL); -+ -+ while (*StringPtr != L'\0') { - // - // 1. Find GUID=...&NAME=...&PATH=... - // --- -1.9.1 - diff --git a/meta/recipes-core/ovmf/ovmf/0001-ia32-Dont-use-pie.patch b/meta/recipes-core/ovmf/ovmf/0001-ia32-Dont-use-pie.patch new file mode 100644 index 0000000000..7ce20be54c --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/0001-ia32-Dont-use-pie.patch @@ -0,0 +1,37 @@ +From f65e9cc025278387b494c2383c5d9ff3bed98687 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 11 Jun 2017 00:47:24 -0700 +Subject: [PATCH] ia32: Dont use -pie + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + BaseTools/Conf/tools_def.template | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template +index 04a1bcb210..84c5f84f93 100755 +--- a/BaseTools/Conf/tools_def.template ++++ b/BaseTools/Conf/tools_def.template +@@ -4336,7 +4336,7 @@ RELEASE_*_*_OBJCOPY_ADDDEBUGFLAG = + NOOPT_*_*_OBJCOPY_ADDDEBUGFLAG = --add-gnu-debuglink=$(DEBUG_DIR)/$(MODULE_NAME).debug + + DEFINE GCC_ALL_CC_FLAGS = -g -Os -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -include AutoGen.h -fno-common +-DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe ++DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double -freorder-blocks -freorder-blocks-and-partition -O2 -mno-stack-arg-probe -fno-PIE -no-pie + DEFINE GCC_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe + DEFINE GCC_IPF_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency + DEFINE GCC_ARM_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -funsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft -fno-pic -fno-pie +@@ -4369,7 +4369,7 @@ DEFINE GCC_ARM_RC_FLAGS = -I binary -O elf32-littlearm -B arm + DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii + + DEFINE GCC44_ALL_CC_FLAGS = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings +-DEFINE GCC44_IA32_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables ++DEFINE GCC44_IA32_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables -fno-PIE -no-pie + DEFINE GCC44_X64_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables + DEFINE GCC44_IA32_X64_DLINK_COMMON = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20 + DEFINE GCC44_IA32_X64_ASLDLINK_FLAGS = DEF(GCC44_IA32_X64_DLINK_COMMON) -Wl,--entry,ReferenceAcpiTable -u ReferenceAcpiTable +-- +2.13.1 + diff --git a/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch b/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch index 0fdc278ce2..1f8332ef56 100644 --- a/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch +++ b/meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch @@ -11,29 +11,28 @@ Signed-off-by: Ricardo Neri BaseTools/Source/C/Makefiles/header.makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/BaseTools/Source/C/Makefiles/header.makefile b/BaseTools/Source/C/Makefiles/header.makefile -index 821d114..fe0f08b 100644 ---- a/BaseTools/Source/C/Makefiles/header.makefile -+++ b/BaseTools/Source/C/Makefiles/header.makefile -@@ -44,14 +44,14 @@ ARCH_INCLUDE = -I $(MAKEROOT)/Include/AArch64/ +Index: git/BaseTools/Source/C/Makefiles/header.makefile +=================================================================== +--- git.orig/BaseTools/Source/C/Makefiles/header.makefile ++++ git/BaseTools/Source/C/Makefiles/header.makefile +@@ -44,15 +44,15 @@ ARCH_INCLUDE = -I $(MAKEROOT)/Include/AA endif INCLUDE = $(TOOL_INCLUDE) -I $(MAKEROOT) -I $(MAKEROOT)/Include/Common -I $(MAKEROOT)/Include/ -I $(MAKEROOT)/Include/IndustryStandard -I $(MAKEROOT)/Common/ -I .. -I . $(ARCH_INCLUDE) -BUILD_CPPFLAGS = $(INCLUDE) -O2 -+BUILD_CPPFLAGS := $(BUILD_CPPFLAGS) $(INCLUDE) -O2 ++BUILD_CPPFLAGS += $(INCLUDE) -O2 ifeq ($(DARWIN),Darwin) # assume clang or clang compatible flags on OS X -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g -+BUILD_CFLAGS := $(BUILD_CFLAGS) -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g ++BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-self-assign -Wno-unused-result -nostdlib -c -g else -BUILD_CFLAGS = -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g -+BUILD_CFLAGS := $(BUILD_CFLAGS) -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g ++BUILD_CFLAGS += -MD -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-deprecated-declarations -Wno-unused-result -nostdlib -c -g endif -BUILD_LFLAGS = -+BUILD_LFLAGS := $(LDFLAGS) - BUILD_CXXFLAGS = +-BUILD_CXXFLAGS = -Wno-unused-result ++BUILD_LFLAGS = $(LDFLAGS) ++BUILD_CXXFLAGS += -Wno-unused-result ifeq ($(ARCH), IA32) --- -2.9.3 - + # diff --git a/meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch b/meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch new file mode 100644 index 0000000000..25a09c5ce3 --- /dev/null +++ b/meta/recipes-core/ovmf/ovmf/no-stack-protector-all-archs.patch @@ -0,0 +1,19 @@ +Author: Steve Langasek +Description: pass -fno-stack-protector to all GCC toolchains + The upstream build rules inexplicably pass -fno-stack-protector only + when building for i386 and amd64. Add this essential argument to the + generic rules for gcc 4.4 and later. +Last-Updated: 2016-04-12 +Index: git/BaseTools/Conf/tools_def.template +=================================================================== +--- git.orig/BaseTools/Conf/tools_def.template ++++ git/BaseTools/Conf/tools_def.template +@@ -4368,7 +4368,7 @@ DEFINE GCC_IPF_RC_FLAGS = -I + DEFINE GCC_ARM_RC_FLAGS = -I binary -O elf32-littlearm -B arm --rename-section .data=.hii + DEFINE GCC_AARCH64_RC_FLAGS = -I binary -O elf64-littleaarch64 -B aarch64 --rename-section .data=.hii + +-DEFINE GCC44_ALL_CC_FLAGS = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings ++DEFINE GCC44_ALL_CC_FLAGS = -g -fshort-wchar -fno-builtin -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-stack-protector -include AutoGen.h -fno-common -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings + DEFINE GCC44_IA32_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m32 -march=i586 -malign-double -fno-stack-protector -D EFI32 -fno-asynchronous-unwind-tables -fno-PIE -no-pie + DEFINE GCC44_X64_CC_FLAGS = DEF(GCC44_ALL_CC_FLAGS) -m64 -fno-stack-protector "-DEFIAPI=__attribute__((ms_abi))" -maccumulate-outgoing-args -mno-red-zone -Wno-address -mcmodel=small -fpie -fno-asynchronous-unwind-tables + DEFINE GCC44_IA32_X64_DLINK_COMMON = -nostdlib -Wl,-n,-q,--gc-sections -z common-page-size=0x20 diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index 9d988e9d41..5d7216e80e 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/meta/recipes-core/ovmf/ovmf_git.bb @@ -14,7 +14,8 @@ SRC_URI = "git://github.com/tianocore/edk2.git;branch=master \ file://0002-ovmf-update-path-to-native-BaseTools.patch \ file://0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch \ file://VfrCompile-increase-path-length-limit.patch \ - file://0001-MdeModulePkg-UefiHiiLib-Fix-incorrect-comparison-exp.patch \ + file://0001-ia32-Dont-use-pie.patch \ + file://no-stack-protector-all-archs.patch \ " SRC_URI_append_class-target = " \ @@ -22,7 +23,7 @@ SRC_URI_append_class-target = " \ file://0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch \ " -SRCREV="4575a602ca6072ee9d04150b38bfb143cbff8588" +SRCREV="ec4910cd3336565fdb61dafdd9ec4ae7a6160ba3" SRC_URI[openssl.md5sum] = "96322138f0b69e61b7212bc53d5e912b" SRC_URI[openssl.sha256sum] = "e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431" @@ -241,3 +242,4 @@ do_deploy_class-target() { addtask do_deploy after do_compile before do_build BBCLASSEXTEND = "native" +TOOLCHAIN = "gcc"