From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2C731A04B1 for ; Thu, 5 Nov 2020 13:42:10 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2363DC7F6; Thu, 5 Nov 2020 13:42:09 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 4D304C31B for ; Thu, 5 Nov 2020 13:42:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=y5bTqqCgB/bUJBGyG8pb75wWEffbtEOsWCGkLQL0gd0=; b=hI81TQv7ByNfK7th4sxLAv8oKJks/htBEFlDGRDCVTGuZjfctNw+gbg3wMnZQq/zDJ5ykP tdDsd111Rsa7w+NiB3bs7oAitrQl7LUPD4zPRhdkqMHvZkEOXG8idYYr85DSJqWRmtt6S0 /nLhJrop4fZVQ2TflkrqY25/8PzloD4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-391-eQl8EwnwMjGDLAqjbiWxAg-1; Thu, 05 Nov 2020 07:42:02 -0500 X-MC-Unique: eQl8EwnwMjGDLAqjbiWxAg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3E506186841A; Thu, 5 Nov 2020 12:42:01 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 743445C5DE; Thu, 5 Nov 2020 12:41:57 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: David Marchand , dpdk stable Date: Thu, 5 Nov 2020 12:39:57 +0000 Message-Id: <20201105124015.306404-50-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'pmdinfogen: fix build with gcc 11' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/3a822363a4f7beb5450f43e7a33fb67698eabbd4 Thanks. Kevin. --- >From 3a822363a4f7beb5450f43e7a33fb67698eabbd4 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Mon, 21 Sep 2020 14:38:30 +0100 Subject: [PATCH] pmdinfogen: fix build with gcc 11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 5a75cc3c88143496030b5bed76bd031ddbe9e355 ] Error observed with gcc 11 under development gcc (GCC) 11.0.0 20200920 (experimental) build error: In file included from ../buildtools/pmdinfogen/pmdinfogen.c:17: ../buildtools/pmdinfogen/pmdinfogen.c: In function ‘parse_elf’: ../buildtools/pmdinfogen/pmdinfogen.h:78:1: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation] 78 | else \ | ^~~~ ../buildtools/pmdinfogen/pmdinfogen.h:83:35: note: in expansion of macro ‘CONVERT_NATIVE’ 83 | #define TO_NATIVE(fend, width, x) CONVERT_NATIVE(fend, width, x) | ^~~~~~~~~~~~~~ ../buildtools/pmdinfogen/pmdinfogen.c:152:28: note: in expansion of macro ‘TO_NATIVE’ 152 | hdr->e_type = TO_NATIVE(endian, 16, hdr->e_type); | ^~~~~~~~~ ../buildtools/pmdinfogen/pmdinfogen.h:80:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘else’ 80 | ___x; \ | ^~~~ Fixes: 98b0fdb0ffc6 ("pmdinfogen: add buildtools and pmdinfogen utility") Signed-off-by: Ferruh Yigit Reviewed-by: David Marchand --- buildtools/pmdinfogen/pmdinfogen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/pmdinfogen/pmdinfogen.h b/buildtools/pmdinfogen/pmdinfogen.h index 27bab30e5e..b398e99ab7 100644 --- a/buildtools/pmdinfogen/pmdinfogen.h +++ b/buildtools/pmdinfogen/pmdinfogen.h @@ -83,5 +83,5 @@ if ((fend) == ELFDATA2LSB) \ else \ ___x = be##width##toh(x); \ - ___x; \ +___x; \ }) -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.193232857 +0000 +++ 0050-pmdinfogen-fix-build-with-gcc-11.patch 2020-11-05 12:38:54.249896027 +0000 @@ -1 +1 @@ -From 5a75cc3c88143496030b5bed76bd031ddbe9e355 Mon Sep 17 00:00:00 2001 +From 3a822363a4f7beb5450f43e7a33fb67698eabbd4 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 5a75cc3c88143496030b5bed76bd031ddbe9e355 ] + @@ -35 +36,0 @@ -Cc: stable@dpdk.org @@ -44 +45 @@ -index 93930e4543..38fd3ddcc3 100644 +index 27bab30e5e..b398e99ab7 100644 @@ -47 +48 @@ -@@ -78,5 +78,5 @@ if ((fend) == ELFDATA2LSB) \ +@@ -83,5 +83,5 @@ if ((fend) == ELFDATA2LSB) \