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 8CE0EA04A3 for ; Fri, 5 Jun 2020 20:27:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 32BB91D52B; Fri, 5 Jun 2020 20:27:27 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id BFAF11D51A for ; Fri, 5 Jun 2020 20:27:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591381645; 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=yzk49lcH8O+yeE4m7eVBzgVRFIWDeRB2RkGalP7+uvw=; b=Lkg4Mc1G3/sp8Ubm7pdxloKfOSx/8aCabzr4YBSVygN9stBiKOZEvrajrGXbVeGBiRqmkk WeqzRFNJX27tYHEOG20G8BWpf9DogujahvGv/hTg5OiL0yOCv/wBUxhMMvpTkj9MQlsqvj kviaGZktEWjjLAwM4JZSdfBSjVJf57s= 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-278-jkfQ54ZEOTKjrP7LO_alTQ-1; Fri, 05 Jun 2020 14:27:21 -0400 X-MC-Unique: jkfQ54ZEOTKjrP7LO_alTQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E7681005510; Fri, 5 Jun 2020 18:27:20 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A82760F80; Fri, 5 Jun 2020 18:27:19 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Bruce Richardson , dpdk stable Date: Fri, 5 Jun 2020 19:24:51 +0100 Message-Id: <20200605182525.22483-54-ktraynor@redhat.com> In-Reply-To: <20200605182525.22483-1-ktraynor@redhat.com> References: <20200605182525.22483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 'eal: fix C++17 compilation' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/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/c3c4ab2586a4ea77824cb021239a26109ff1f422 Thanks. Kevin. --- >From c3c4ab2586a4ea77824cb021239a26109ff1f422 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 48bf28ca5d..5006ba8cad 100644 --- a/lib/librte_eal/common/include/rte_common.h +++ b/lib/librte_eal/common/include/rte_common.h @@ -284,5 +284,5 @@ rte_is_aligned(void *ptr, unsigned align) */ static inline uint32_t -rte_combine32ms1b(register uint32_t x) +rte_combine32ms1b(uint32_t x) { x |= x >> 1; @@ -306,5 +306,5 @@ rte_combine32ms1b(register uint32_t x) */ static inline uint64_t -rte_combine64ms1b(register uint64_t v) +rte_combine64ms1b(uint64_t v) { v |= v >> 1; -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-05 19:20:53.774160460 +0100 +++ 0054-eal-fix-C-17-compilation.patch 2020-06-05 19:20:50.861039654 +0100 @@ -1 +1 @@ -From 3a2cd6fd069e26410810df6c2ec81d283bb6fbaa Mon Sep 17 00:00:00 2001 +From c3c4ab2586a4ea77824cb021239a26109ff1f422 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 3a2cd6fd069e26410810df6c2ec81d283bb6fbaa ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ - lib/librte_eal/include/rte_common.h | 4 ++-- + lib/librte_eal/common/include/rte_common.h | 4 ++-- @@ -30,5 +31,5 @@ -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 -@@ -410,5 +410,5 @@ __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 48bf28ca5d..5006ba8cad 100644 +--- a/lib/librte_eal/common/include/rte_common.h ++++ b/lib/librte_eal/common/include/rte_common.h +@@ -284,5 +284,5 @@ rte_is_aligned(void *ptr, unsigned align) @@ -41 +42 @@ -@@ -432,5 +432,5 @@ rte_combine32ms1b(register uint32_t x) +@@ -306,5 +306,5 @@ rte_combine32ms1b(register uint32_t x)