From patchwork Wed Nov 15 03:28:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 118901 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3813197qgn; Tue, 14 Nov 2017 19:28:49 -0800 (PST) X-Google-Smtp-Source: AGs4zMbR7Qo3Qgnv5hwUKye8WXUmeQgAH6FX/XBvWg0CEQMwohAM2TCDJh0Gj1AGsOE2pFVZieYU X-Received: by 10.159.246.134 with SMTP id c6mr7701018pls.371.1510716529100; Tue, 14 Nov 2017 19:28:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510716529; cv=none; d=google.com; s=arc-20160816; b=MClLyl0xCxjtka8q21jpYt8WUtAdmuXnnukcUmcpTE+oW11tQPAPE0/8BxcDOU4Idp W9BfPoHFXRLb9bx3ZUIo7TMiL1ntAsUX0EtsZ0xkzvjx7m56flXH0EkGxIkywuGOfBKl tC/JJSuHyitJI2d70ISFLJrIkLaIQZx6jXRZP28TXbeegHBi5ha2/0wkZbJvkV61TvN4 BoLWFL7VDEQFfQc9IHri1Y3SahE1M55RWs4RKO9r/ifBZUkETH1qETUeHg8hD2LfANWi Mr9tWfGZ6LMIoZ4G5GQutpooSs1MWMqgZtUd7QQJ9L4C6iuhrMYavpZDC8yZRbIzrrdZ sj/Q== 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=8rwulOFAlmTfA+7tAK3Yt2ksgEVPhGYZj5BPHAXh/wI=; b=kH+LX/BX4+1uAgfX5crrFH1wYc3/Y/rVcK9yGnNNvpSgi2X1Au9i7BcO8hSpX2HoQu Z3mgIdWsiJ+7gSrOi4NWZ6DS76+m0OgPQVYuXjSFTXK8NPwXIG+YgT8knthhz/RIXKDZ CwLbrkkSGDaaYcbGRyjX4kjbXF2AOLi0LlOwLfe4Z6e8qWTiQVCdpA5NIF5v6B7PDnbG qSWnWW2eA3mut+cN8snjFQh2v4xJTM8BcjChZ9f2JYTqTemOubY7S/KyAKE6fkfz8il6 k2ywCenLv61LraukZMizcMn6UIHl3Fk9uBGNLt8MO5XEYD+sbbhrzpTFCYyG2t/nDCD8 qUvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=oLfB468l; 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 k4si17412954pll.71.2017.11.14.19.28.48; Tue, 14 Nov 2017 19:28:49 -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=oLfB468l; 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 1661C7851A; Wed, 15 Nov 2017 03:28:44 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by mail.openembedded.org (Postfix) with ESMTP id 08BDA784AD for ; Wed, 15 Nov 2017 03:28:43 +0000 (UTC) Received: by mail-qt0-f194.google.com with SMTP id p44so20957954qtj.6 for ; Tue, 14 Nov 2017 19:28:45 -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; bh=TxTFNeWsf8txxTE58UeBVsfEPqFzrM63ZbtyGRkmdNk=; b=oLfB468lAsTdbYGfhzz47Hf8j9ZQP/0/gDzKdiob/n1Uqrf2d5UNNHky9fkk0gLShm STPaGd0bg6Dut96ZRITp52nQ72E8PR8WSWJypyC8eCknDrRQNdwZ9ln4MdZnE6mNRzWW acXX8phfexI+i27z3qc3qZg++vwBvM7M2Cf0OoQIM1WEVSufAdeSFFMgn2EYVgi041ye xmt1NHJiorH3TNonJW2ggoOgl1kPVv36nmDjGb5wY0mzqobk8yjOnK0KbicwWYDviryy j5xSkW9AtJVsMP9tZylcYJaT77naK0FhKqKo13KexvDE4gxCfPnn8Gx45mNfi53PK1hM fv/A== 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; bh=TxTFNeWsf8txxTE58UeBVsfEPqFzrM63ZbtyGRkmdNk=; b=GjFY9wkyE5VqFbOG3UuwBoktT8vIeSDFkMq81dCfox/Ztdn5v7k7TVKTiDKZ2YqI4D K89S4DYJgXI7VD9s4vBtP1q8wS5/BUKvwR5abTOhe1+TX9COOMygx/41Bz/zTHasYliU nkeMB0JFUrvG6aUIqCh7AF/+UE76FtbpX+L9cdjzuz0JMqmxZT+5fsvjx3CvR7pPv/6b P0ziWQvazK43vr9JhvDmeCKaTK/PsqDhOA0EzuFkttiO9JmK7KJ6WBUDnHFc9elO16di a3n/rIdnqepeojkd5sWYS0M+763kOyAVxlOliUGRaGtcyT1B8wmAT/I9Pg8pI7ys0GnK QZOg== X-Gm-Message-State: AJaThX5i2IgKBfuE0H3KPYm5JFrIeJ+uCtgTAwfHxXMPv9LKrz6kVA6i iCHURPuujz3tDmh7paW5NjuExQ== X-Received: by 10.55.0.149 with SMTP id t21mr2527113qkg.249.1510716524360; Tue, 14 Nov 2017 19:28:44 -0800 (PST) Received: from localhost.localdomain ([2601:646:8882:b8c::a4a]) by smtp.gmail.com with ESMTPSA id p52sm3149924qtc.72.2017.11.14.19.28.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Nov 2017 19:28:43 -0800 (PST) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Tue, 14 Nov 2017 19:28:35 -0800 Message-Id: <20171115032835.29342-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.15.0 Subject: [OE-core] [PATCH V2 8/8] glibc: Upgrade to latest on 2.26 release 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 For detailed view of changes see https://github.com/kraj/glibc/compare/glibc-2.26...77f921dac17c5fa99bd9e926d926c327982895f7 drop upstreamed 1 patch Signed-off-by: Khem Raj --- Changes in v2: Drop upstreamed patch ...ress-pedantic-warning-caused-by-statement.patch | 90 ---------------------- meta/recipes-core/glibc/glibc_2.26.bb | 3 +- 2 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 meta/recipes-core/glibc/glibc/0026-assert-Suppress-pedantic-warning-caused-by-statement.patch -- 2.15.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/glibc/glibc/0026-assert-Suppress-pedantic-warning-caused-by-statement.patch b/meta/recipes-core/glibc/glibc/0026-assert-Suppress-pedantic-warning-caused-by-statement.patch deleted file mode 100644 index b2bb96b818..0000000000 --- a/meta/recipes-core/glibc/glibc/0026-assert-Suppress-pedantic-warning-caused-by-statement.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 037283cbc74739b72f36dfec827d120faa243406 Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Thu, 6 Jul 2017 11:50:55 +0200 -Subject: [PATCH 26/26] assert: Suppress pedantic warning caused by statement - expression [BZ# 21242] - -On 07/05/2017 10:15 PM, Zack Weinberg wrote: -> On Wed, Jul 5, 2017 at 11:51 AM, Florian Weimer wrote: ->> On 07/05/2017 05:46 PM, Zack Weinberg wrote: ->>> A problem occurs to me: expressions involving VLAs _are_ evaluated ->>> inside sizeof. ->> ->> The type of the sizeof argument would still be int (due to the ->> comparison against 0), so this doesn't actually occur. -> -> I rechecked what C99 says about sizeof and VLAs, and you're right - -> the operand of sizeof is only evaluated when sizeof is _directly_ -> applied to a VLA. So this is indeed safe, but I think this wrinkle -> should be mentioned in the comment. Perhaps -> -> /* The first occurrence of EXPR is not evaluated due to the sizeof, -> but will trigger any pedantic warnings masked by the __extension__ -> for the second occurrence. The explicit comparison against zero -> ensures that sizeof is not directly applied to a function pointer or -> bit-field (which would be ill-formed) or VLA (which would be evaluated). */ -> -> zw - -What about the attached patch? - -Siddhesh, is this okay during the freeze? I'd like to backport it to -2.25 as well. - -Thanks, -Florian - -assert: Suppress pedantic warning caused by statement expression - -2017-07-06 Florian Weimer - - [BZ #21242] - * assert/assert.h [__GNUC__ && !__STRICT_ANSI__] (assert): - Suppress pedantic warning resulting from statement expression. - (__ASSERT_FUNCTION): Add missing __extendsion__. ---- - -Upstream-Status: Submitted -Signed-off-by: Khem Raj - - assert/assert.h | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/assert/assert.h b/assert/assert.h -index 22f019537c..6801cfeb10 100644 ---- a/assert/assert.h -+++ b/assert/assert.h -@@ -91,13 +91,19 @@ __END_DECLS - ? __ASSERT_VOID_CAST (0) \ - : __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION)) - # else -+/* The first occurrence of EXPR is not evaluated due to the sizeof, -+ but will trigger any pedantic warnings masked by the __extension__ -+ for the second occurrence. The explicit comparison against zero is -+ required to support function pointers and bit fields in this -+ context, and to suppress the evaluation of variable length -+ arrays. */ - # define assert(expr) \ -- ({ \ -+ ((void) sizeof ((expr) == 0), __extension__ ({ \ - if (expr) \ - ; /* empty */ \ - else \ - __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION); \ -- }) -+ })) - # endif - - # ifdef __USE_GNU -@@ -113,7 +119,7 @@ __END_DECLS - C9x has a similar variable called __func__, but prefer the GCC one since - it demangles C++ function names. */ - # if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4) --# define __ASSERT_FUNCTION __PRETTY_FUNCTION__ -+# define __ASSERT_FUNCTION __extension__ __PRETTY_FUNCTION__ - # else - # if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L - # define __ASSERT_FUNCTION __func__ --- -2.13.3 - diff --git a/meta/recipes-core/glibc/glibc_2.26.bb b/meta/recipes-core/glibc/glibc_2.26.bb index 135ec4fb16..5213a6a942 100644 --- a/meta/recipes-core/glibc/glibc_2.26.bb +++ b/meta/recipes-core/glibc/glibc_2.26.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \ DEPENDS += "gperf-native" -SRCREV ?= "1c9a5c270d8b66f30dcfaf1cb2d6cf39d3e18369" +SRCREV ?= "77f921dac17c5fa99bd9e926d926c327982895f7" SRCBRANCH ?= "release/${PV}/master" @@ -40,7 +40,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \ file://0023-Define-DUMMY_LOCALE_T-if-not-defined.patch \ file://0024-elf-dl-deps.c-Make-_dl_build_local_scope-breadth-fir.patch \ file://0025-locale-fix-hard-coded-reference-to-gcc-E.patch \ - file://0026-assert-Suppress-pedantic-warning-caused-by-statement.patch \ file://0027-glibc-reset-dl-load-write-lock-after-forking.patch \ file://0028-Bug-4578-add-ld.so-lock-while-fork.patch \ "