patch 'eal/x86: fix C++ build' has been queued to stable release 24.11.3

[Kevin Traynor]

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 <edvard.fagerholm at gmail.com>
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 <edvard.fagerholm at gmail.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 .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 <dzmitryx.sautsa at intel.com>
 Ed Czeck <ed.czeck at atomicrules.com>
 Eduard Serra <eserra at vmware.com>
+Edvard Fagerholm <edvard.fagerholm at gmail.com>
 Edward Makarov <makarov at kraftway.ru>
 Edwin Brossette <edwin.brossette at 6wind.com>
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 at dpdk.org
@@ -22 +23 @@
-index 6126f7e472..c6d72058bb 100644
+index 6a039f1be3..5c01a6eaa1 100644
@@ -25 +26 @@
-@@ -395,4 +395,5 @@ Dzmitry Sautsa <dzmitryx.sautsa at intel.com>
+@@ -392,4 +392,5 @@ Dzmitry Sautsa <dzmitryx.sautsa at intel.com>