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 14557A04DD for ; Wed, 28 Oct 2020 11:52:26 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0CAA249E0; Wed, 28 Oct 2020 11:52:25 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 3F8DA49E0 for ; Wed, 28 Oct 2020 11:52:23 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id s9so5158168wro.8 for ; Wed, 28 Oct 2020 03:52: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 :mime-version:content-transfer-encoding; bh=ZEMmpD6Vr2qvSE6peITZ+Z171L97L5NfoiAgNutJ740=; b=O+e/yev4s6qv7fHVtWz+lqim4wKuHmsH9IfEshbyAby9uqkh01sGuHx3VRRrUK8sZW zvoKdazTfhpoADknvJpEP7RmnUJzZj9zhV5Tjge9gRw1oROfkqXrB8i/qBKn1iIvzudN KZszdN9u4IiOqPPa6pp+NELquHPWiEQR/6mJSRy0EyEh4yl9Wd+2Uv12tsyIBx9i9ks4 h1LSVEVPYM6nG8dU2zR6vERgNSORCztfzOW/ZmrOTelP4yldk6JQRJEsLgvuXZfUePqe iiyLd/F69rkLWH03zVVik8CA/22mR0M3ywT+noKMzDAZg0SBLfruPy3T6voncYMKX21w XGFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZEMmpD6Vr2qvSE6peITZ+Z171L97L5NfoiAgNutJ740=; b=p1yNIth070VoTs0OdN/VXpGm/HS5/v6gzI4WECT5HJImaErY9Hfjf1hPJXAQbte58R 5BoqukFwVjTgEUBjXJGBvqkgpc4gTsTLrW2dhbQEuplQQdh6y3aKVOpbaWMYXC0JMM3X 33O5xwNJNt/J5nDlroAMtXR3hGQMXvcffzjo52jilNwfHldHl+CtWyAkTIEvj6CdyQav s2BEhWjLafG27rrN14AO3FqJ4+f4OwTNYAWzBExBJZoyystew/g7GlfXgGxVOTeHF43y GDaXVgIhA5m09u58HSIR0QNBdK+Idd2xMvGqetbB37gDcK0eei3+RVFCJGYEkDpSXWIK jjCg== X-Gm-Message-State: AOAM531T/e2DbKC1cqhF1GMWEqLGZheSSlgyhjy0SiO+5d/csEpWWHWv 74QUIDrggonESIOwCwbTIuc= X-Google-Smtp-Source: ABdhPJzOQxCdXGl8DdXdeTqrrq0yoXvKs2RczidlOMg67FMbFij24IHbiWDszExC7megj1z+widxRw== X-Received: by 2002:adf:dfc7:: with SMTP id q7mr7876266wrn.382.1603882341950; Wed, 28 Oct 2020 03:52:21 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g66sm2157350wmg.37.2020.10.28.03.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:52:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: David Marchand , dpdk stable Date: Wed, 28 Oct 2020 10:44:35 +0000 Message-Id: <20201028104606.3504127-116-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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. Thanks. Luca Boccassi --- >From 928a5ae05cdd22d975566b82c1b2c66fd107d9ca 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 c8a9e2136a..467216d12b 100644 --- a/buildtools/pmdinfogen/pmdinfogen.h +++ b/buildtools/pmdinfogen/pmdinfogen.h @@ -82,7 +82,7 @@ if ((fend) == ELFDATA2LSB) \ ___x = le##width##toh(x); \ else \ ___x = be##width##toh(x); \ - ___x; \ +___x; \ }) #define TO_NATIVE(fend, width, x) CONVERT_NATIVE(fend, width, x) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.358138557 +0000 +++ 0116-pmdinfogen-fix-build-with-gcc-11.patch 2020-10-28 10:35:11.672832496 +0000 @@ -1,4 +1,4 @@ -From 5a75cc3c88143496030b5bed76bd031ddbe9e355 Mon Sep 17 00:00:00 2001 +From 928a5ae05cdd22d975566b82c1b2c66fd107d9ca 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 @@ -6,6 +6,8 @@ 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) @@ -32,7 +34,6 @@ | ^~~~ Fixes: 98b0fdb0ffc6 ("pmdinfogen: add buildtools and pmdinfogen utility") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Reviewed-by: David Marchand @@ -41,10 +42,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildtools/pmdinfogen/pmdinfogen.h b/buildtools/pmdinfogen/pmdinfogen.h -index 93930e4543..38fd3ddcc3 100644 +index c8a9e2136a..467216d12b 100644 --- a/buildtools/pmdinfogen/pmdinfogen.h +++ b/buildtools/pmdinfogen/pmdinfogen.h -@@ -77,7 +77,7 @@ if ((fend) == ELFDATA2LSB) \ +@@ -82,7 +82,7 @@ if ((fend) == ELFDATA2LSB) \ ___x = le##width##toh(x); \ else \ ___x = be##width##toh(x); \