From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8300746BAE for ; Fri, 18 Jul 2025 21:36:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7DA0240611; Fri, 18 Jul 2025 21:36:46 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id BE83640611 for ; Fri, 18 Jul 2025 21:36:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867403; 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=KWBB5v9MoqscUY2VhfWHhq/OiODhNUIkzVTKvNMt9Q8=; b=RDzuSADSpgbnkJjUXmRZBSW0p6HO0xNHQAL9eZwoUaCc/cDOzNaxfqAOYCiS3oRJjiqjiF ZACtnHWrfMslJK7H2jwGq66YldixVte1V63I6fJ7NYSUsJRncE63t6SUptPnjehsmGVZQ+ 2pJnfqiUzxft+l0ROYHAgOTUq/o9BSs= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-447-baABtSU_On2vr7Xj8-IFIQ-1; Fri, 18 Jul 2025 15:36:41 -0400 X-MC-Unique: baABtSU_On2vr7Xj8-IFIQ-1 X-Mimecast-MFC-AGG-ID: baABtSU_On2vr7Xj8-IFIQ_1752867400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D173A19560A5; Fri, 18 Jul 2025 19:36:40 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4991918003FC; Fri, 18 Jul 2025 19:36:38 +0000 (UTC) From: Kevin Traynor To: Edvard Fagerholm Cc: Bruce Richardson , dpdk stable Subject: patch 'eal/x86: fix C++ build' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:30:42 +0100 Message-ID: <20250718193247.1008129-108-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Bs04WZO1fQQmkeukAfrnh7TDP9_a6wbzgAQSb2cFR4k_1752867400 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 24.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 07/23/25. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f2c7ad2a87de7e33270894224f34bc42513a9ad1 Thanks. Kevin --- >From f2c7ad2a87de7e33270894224f34bc42513a9ad1 Mon Sep 17 00:00:00 2001 From: Edvard Fagerholm Date: Tue, 24 Jun 2025 22:58:10 +0300 Subject: [PATCH] eal/x86: fix C++ build [ upstream commit 2c6f1f0a847898732c18c8b37821850f1b48aa9d ] RTE_FORCE_INTRINSICS with a C++ compiler causes rte_atomic.h and rte_byteorder.h to emit on x86 an extern "C" without a closing brace. Fixes: 719834a6849e ("use C linkage where appropriate in headers") Signed-off-by: Edvard Fagerholm Acked-by: Bruce Richardson --- .mailmap | 1 + lib/eal/x86/include/rte_atomic.h | 6 +++--- lib/eal/x86/include/rte_byteorder.h | 9 +++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.mailmap b/.mailmap index 6a039f1be3..5c01a6eaa1 100644 --- a/.mailmap +++ b/.mailmap @@ -392,4 +392,5 @@ Dzmitry Sautsa Ed Czeck Eduard Serra +Edvard Fagerholm Edward Makarov Edwin Brossette diff --git a/lib/eal/x86/include/rte_atomic.h b/lib/eal/x86/include/rte_atomic.h index c72c47c83e..e071e4234e 100644 --- a/lib/eal/x86/include/rte_atomic.h +++ b/lib/eal/x86/include/rte_atomic.h @@ -283,10 +283,10 @@ static inline int rte_atomic32_dec_and_test(rte_atomic32_t *v) } +#endif /* !RTE_FORCE_INTRINSICS */ + #ifdef __cplusplus } #endif -#endif - #ifdef RTE_ARCH_I686 #include "rte_atomic_32.h" @@ -295,5 +295,5 @@ static inline int rte_atomic32_dec_and_test(rte_atomic32_t *v) #endif -#endif +#endif /* !RTE_TOOLCHAIN_MSVC */ #endif /* _RTE_ATOMIC_X86_H_ */ diff --git a/lib/eal/x86/include/rte_byteorder.h b/lib/eal/x86/include/rte_byteorder.h index 5a49ffcd50..bcf4a02225 100644 --- a/lib/eal/x86/include/rte_byteorder.h +++ b/lib/eal/x86/include/rte_byteorder.h @@ -49,8 +49,4 @@ static inline uint32_t rte_arch_bswap32(uint32_t _x) } -#ifdef __cplusplus -} -#endif - #define rte_bswap16(x) ((uint16_t)(__builtin_constant_p(x) ? \ rte_constant_bswap16(x) : \ @@ -70,4 +66,9 @@ static inline uint32_t rte_arch_bswap32(uint32_t _x) #include "rte_byteorder_64.h" #endif + +#endif /* !RTE_FORCE_INTRINSICS */ + +#ifdef __cplusplus +} #endif -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:14.767999496 +0100 +++ 0108-eal-x86-fix-C-build.patch 2025-07-18 20:29:11.043907677 +0100 @@ -1 +1 @@ -From 2c6f1f0a847898732c18c8b37821850f1b48aa9d Mon Sep 17 00:00:00 2001 +From f2c7ad2a87de7e33270894224f34bc42513a9ad1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2c6f1f0a847898732c18c8b37821850f1b48aa9d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 6126f7e472..c6d72058bb 100644 +index 6a039f1be3..5c01a6eaa1 100644 @@ -25 +26 @@ -@@ -395,4 +395,5 @@ Dzmitry Sautsa +@@ -392,4 +392,5 @@ Dzmitry Sautsa