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 8CAB4A0093 for ; Fri, 22 May 2020 11:40:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 83D941D966; Fri, 22 May 2020 11:40:51 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 58DD31D966 for ; Fri, 22 May 2020 11:40:48 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id f13so8045853wmc.5 for ; Fri, 22 May 2020 02:40:48 -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=8KiuB18ZQBqrkEpKtBJzyCUC5L5MUprtd0uNA3R3M4M=; b=GTk3G4l0CMFbpSeMv3cTmVAkXg6mgqsO+eLVIXswJ6YkuiHG4VP7+Ad20Hiz6B40jO e0jssBm5Yice3/hHut9BEHDenfhyPq0VCeKBIezI0NjX1H78n5r0WvJMYMPdYoMIogvB I5ZU56F/GLVpNmJC7FhLIX+PSmfX8Pk5kSewrcGzD6ckJ80IgtISSUK/Cr+sgIZ0Rq14 EaJHseNDZ2slHIT25jQdORnw/z7CqbXafsvGKUS7r9FR6aJ5izsuRTQ23o/OoOLUMwbh nV6X1jfWfrBmsYDI6m33PfmbqBdBpGulUJVg9D7vhOJPH5HAWcDUZTC8wzClpUz9CmxO Eq5w== 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=8KiuB18ZQBqrkEpKtBJzyCUC5L5MUprtd0uNA3R3M4M=; b=GX0jqU+w5Zd0BMUiFUg0vlnxtBSXWvj/S/ZwnXlzZCCdb5sNSB5kY+ebf/9lvRd5Lx KOIJnBds5E9v5SVmWFg8osl0rjqqW1/03gF2A7MjUJM7OMS4AJMR3fbp2PO0Lr2BWHV2 f784laC9cNWCq2yq1He5qp6LAxDmok5OriOFFqn8rYSeiEvBBnLY9xBtUrcP1M6V9WRc Gc35gX7fiVgx8rdaSZY4XQhGJOfYRVRbYqHOP3E6P4NCUSH3Ym9bcaAjQKT3tngmZtT8 i+d7Qe55IgQrfAP5OV58V2P/X8zJ3/iD7teZX9n4Rqm3J/tlcaMQISKD1GwqwhxJJM7K +X/Q== X-Gm-Message-State: AOAM530JKBLjlxdtFnAwqt7gjYaHIpCbIF5rsRSpgbsGn5SN67yxIItC GbxEJpoBgWTw8RAkwqWzH8Q= X-Google-Smtp-Source: ABdhPJy3l26acKqoVQb8xpw0iJ3G3Rr/T66wXy6a/ZGWz3CtZv0bLidlQlcNfyXcSO6TXT5yXJoxwQ== X-Received: by 2002:a7b:cd8f:: with SMTP id y15mr13400833wmj.140.1590140448128; Fri, 22 May 2020 02:40:48 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w82sm8978468wmg.28.2020.05.22.02.40.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:40:47 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Bruce Richardson , dpdk stable Date: Fri, 22 May 2020 10:39:47 +0100 Message-Id: <20200522094022.1025696-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'eal: fix C++17 compilation' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/24/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 da5586fcbea509717b38c764e20de12e3dceb5b5 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 8 May 2020 16:25:05 -0700 Subject: [PATCH] eal: fix C++17 compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 3a2cd6fd069e26410810df6c2ec81d283bb6fbaa ] Compiling a C++ application that includes directly or indirectly rte_common.h will cause a warning: include/rte_common.h:350:37: warning: ISO C++17 does not allow ‘register’ storage class specifier [-Wregister] rte_combine32ms1b(register uint32_t x) C++ is pickier than standard C and flags this antique usage. The register keyword is an old K&R legacy and should be removed everywhere in DPDK. For now, fix it where it hurts. Fixes: 08f683174e94 ("eal: add functions for previous power of 2 alignment") Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- lib/librte_eal/common/include/rte_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h index c352838073..41e2778ec1 100644 --- a/lib/librte_eal/common/include/rte_common.h +++ b/lib/librte_eal/common/include/rte_common.h @@ -347,7 +347,7 @@ typedef uint64_t rte_iova_t; * The combined value. */ static inline uint32_t -rte_combine32ms1b(register uint32_t x) +rte_combine32ms1b(uint32_t x) { x |= x >> 1; x |= x >> 2; @@ -369,7 +369,7 @@ rte_combine32ms1b(register uint32_t x) * The combined value. */ static inline uint64_t -rte_combine64ms1b(register uint64_t v) +rte_combine64ms1b(uint64_t v) { v |= v >> 1; v |= v >> 2; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:39.536608858 +0100 +++ 0008-eal-fix-C-17-compilation.patch 2020-05-22 10:37:39.064411567 +0100 @@ -1,4 +1,4 @@ -From 3a2cd6fd069e26410810df6c2ec81d283bb6fbaa Mon Sep 17 00:00:00 2001 +From da5586fcbea509717b38c764e20de12e3dceb5b5 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 8 May 2020 16:25:05 -0700 Subject: [PATCH] eal: fix C++17 compilation @@ -6,6 +6,8 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +[ upstream commit 3a2cd6fd069e26410810df6c2ec81d283bb6fbaa ] + Compiling a C++ application that includes directly or indirectly rte_common.h will cause a warning: @@ -19,19 +21,18 @@ everywhere in DPDK. For now, fix it where it hurts. Fixes: 08f683174e94 ("eal: add functions for previous power of 2 alignment") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson --- - lib/librte_eal/include/rte_common.h | 4 ++-- + lib/librte_eal/common/include/rte_common.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/lib/librte_eal/include/rte_common.h b/lib/librte_eal/include/rte_common.h -index 668e8b0af8..0843ce69e7 100644 ---- a/lib/librte_eal/include/rte_common.h -+++ b/lib/librte_eal/include/rte_common.h -@@ -409,7 +409,7 @@ __extension__ typedef uint64_t RTE_MARKER64[0]; +diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h +index c352838073..41e2778ec1 100644 +--- a/lib/librte_eal/common/include/rte_common.h ++++ b/lib/librte_eal/common/include/rte_common.h +@@ -347,7 +347,7 @@ typedef uint64_t rte_iova_t; * The combined value. */ static inline uint32_t @@ -40,7 +41,7 @@ { x |= x >> 1; x |= x >> 2; -@@ -431,7 +431,7 @@ rte_combine32ms1b(register uint32_t x) +@@ -369,7 +369,7 @@ rte_combine32ms1b(register uint32_t x) * The combined value. */ static inline uint64_t