patch 'config: fix C++ cross compiler for Arm and PPC' has been queued to stable release 20.11.6
Xueming Li
xuemingl at nvidia.com
Wed Jul 20 10:20:55 CEST 2022
Hi,
FYI, your patch has been queued to stable release 20.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 07/22/22. 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/steevenlee/dpdk
This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/45eb4af45623cf627cbb873c20bc859ce05ade61
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 45eb4af45623cf627cbb873c20bc859ce05ade61 Mon Sep 17 00:00:00 2001
From: Stanislaw Kardach <kda at semihalf.com>
Date: Tue, 21 Jun 2022 14:28:23 +0200
Subject: [PATCH] config: fix C++ cross compiler for Arm and PPC
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit f75dd6d3b1215c2e7cdbdc290b5789517c8cfe10 ]
Through some mixup all cross-files for ARM and PowerPC platforms were
using C Preprocessor (cpp) instead of GCC (g++).
This caused meson to fail detecting the C++ compiler presence and
therefore disabling some targets (i.e. C++ include file checks).
Fixes: e53a5299d219 ("build: support vendor specific ARM cross builds")
Signed-off-by: Stanislaw Kardach <kda at semihalf.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
config/arm/arm64_armada_linux_gcc | 2 +-
config/arm/arm64_armv8_linux_gcc | 2 +-
config/arm/arm64_bluefield_linux_gcc | 2 +-
config/arm/arm64_dpaa_linux_gcc | 2 +-
config/arm/arm64_emag_linux_gcc | 2 +-
config/arm/arm64_graviton2_linux_gcc | 2 +-
config/arm/arm64_n1sdp_linux_gcc | 2 +-
config/arm/arm64_octeontx2_linux_gcc | 2 +-
config/arm/arm64_stingray_linux_gcc | 2 +-
config/arm/arm64_thunderx2_linux_gcc | 2 +-
config/arm/arm64_thunderx_linux_gcc | 2 +-
config/ppc/ppc64le-power8-linux-gcc | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/config/arm/arm64_armada_linux_gcc b/config/arm/arm64_armada_linux_gcc
index fa40c0398f..d78c99e8e8 100644
--- a/config/arm/arm64_armada_linux_gcc
+++ b/config/arm/arm64_armada_linux_gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+cpp = 'aarch64-linux-gnu-g++'
ar = 'aarch64-linux-gnu-ar'
as = 'aarch64-linux-gnu-as'
strip = 'aarch64-linux-gnu-strip'
diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc
index 88f0ff9dae..057d70bbdd 100644
--- a/config/arm/arm64_armv8_linux_gcc
+++ b/config/arm/arm64_armv8_linux_gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+cpp = 'aarch64-linux-gnu-g++'
ar = 'aarch64-linux-gnu-gcc-ar'
strip = 'aarch64-linux-gnu-strip'
pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/arm/arm64_bluefield_linux_gcc b/config/arm/arm64_bluefield_linux_gcc
index 86797d23cd..616e633495 100644
--- a/config/arm/arm64_bluefield_linux_gcc
+++ b/config/arm/arm64_bluefield_linux_gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+cpp = 'aarch64-linux-gnu-g++'
ar = 'aarch64-linux-gnu-gcc-ar'
strip = 'aarch64-linux-gnu-strip'
pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/arm/arm64_dpaa_linux_gcc b/config/arm/arm64_dpaa_linux_gcc
index 1a46821543..0108bb952a 100644
--- a/config/arm/arm64_dpaa_linux_gcc
+++ b/config/arm/arm64_dpaa_linux_gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+cpp = 'aarch64-linux-gnu-g++'
ar = 'aarch64-linux-gnu-ar'
as = 'aarch64-linux-gnu-as'
strip = 'aarch64-linux-gnu-strip'
diff --git a/config/arm/arm64_emag_linux_gcc b/config/arm/arm64_emag_linux_gcc
index 8edcd3e976..3bb5134224 100644
--- a/config/arm/arm64_emag_linux_gcc
+++ b/config/arm/arm64_emag_linux_gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+cpp = 'aarch64-linux-gnu-g++'
ar = 'aarch64-linux-gnu-gcc-ar'
strip = 'aarch64-linux-gnu-strip'
pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/arm/arm64_graviton2_linux_gcc b/config/arm/arm64_graviton2_linux_gcc
index 022e063039..421d06c77f 100644
--- a/config/arm/arm64_graviton2_linux_gcc
+++ b/config/arm/arm64_graviton2_linux_gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+cpp = 'aarch64-linux-gnu-g++'
ar = 'aarch64-linux-gnu-gcc-ar'
strip = 'aarch64-linux-gnu-strip'
pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/arm/arm64_n1sdp_linux_gcc b/config/arm/arm64_n1sdp_linux_gcc
index 022e063039..421d06c77f 100644
--- a/config/arm/arm64_n1sdp_linux_gcc
+++ b/config/arm/arm64_n1sdp_linux_gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+cpp = 'aarch64-linux-gnu-g++'
ar = 'aarch64-linux-gnu-gcc-ar'
strip = 'aarch64-linux-gnu-strip'
pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/arm/arm64_octeontx2_linux_gcc b/config/arm/arm64_octeontx2_linux_gcc
index 365bd7cbdd..0d7a66c97e 100644
--- a/config/arm/arm64_octeontx2_linux_gcc
+++ b/config/arm/arm64_octeontx2_linux_gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+cpp = 'aarch64-linux-gnu-g++'
ar = 'aarch64-linux-gnu-gcc-ar'
strip = 'aarch64-linux-gnu-strip'
pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/arm/arm64_stingray_linux_gcc b/config/arm/arm64_stingray_linux_gcc
index 86797d23cd..616e633495 100644
--- a/config/arm/arm64_stingray_linux_gcc
+++ b/config/arm/arm64_stingray_linux_gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+cpp = 'aarch64-linux-gnu-g++'
ar = 'aarch64-linux-gnu-gcc-ar'
strip = 'aarch64-linux-gnu-strip'
pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/arm/arm64_thunderx2_linux_gcc b/config/arm/arm64_thunderx2_linux_gcc
index 2b41acc615..24346ffe71 100644
--- a/config/arm/arm64_thunderx2_linux_gcc
+++ b/config/arm/arm64_thunderx2_linux_gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+cpp = 'aarch64-linux-gnu-g++'
ar = 'aarch64-linux-gnu-gcc-ar'
strip = 'aarch64-linux-gnu-strip'
pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/arm/arm64_thunderx_linux_gcc b/config/arm/arm64_thunderx_linux_gcc
index 6572ab615d..cbf60bac73 100644
--- a/config/arm/arm64_thunderx_linux_gcc
+++ b/config/arm/arm64_thunderx_linux_gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'aarch64-linux-gnu-gcc'
-cpp = 'aarch64-linux-gnu-cpp'
+cpp = 'aarch64-linux-gnu-g++'
ar = 'aarch64-linux-gnu-gcc-ar'
strip = 'aarch64-linux-gnu-strip'
pkgconfig = 'aarch64-linux-gnu-pkg-config'
diff --git a/config/ppc/ppc64le-power8-linux-gcc b/config/ppc/ppc64le-power8-linux-gcc
index 51f7ceebf3..784c33df9e 100644
--- a/config/ppc/ppc64le-power8-linux-gcc
+++ b/config/ppc/ppc64le-power8-linux-gcc
@@ -1,6 +1,6 @@
[binaries]
c = 'powerpc64le-linux-gcc'
-cpp = 'powerpc64le-linux-cpp'
+cpp = 'powerpc64le-linux-g++'
ar = 'powerpc64le-linux-gcc-ar'
strip = 'powerpc64le-linux-strip'
--
2.35.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-07-20 15:00:59.972904920 +0800
+++ 0026-config-fix-C-cross-compiler-for-Arm-and-PPC.patch 2022-07-20 15:00:58.714333824 +0800
@@ -1 +1 @@
-From f75dd6d3b1215c2e7cdbdc290b5789517c8cfe10 Mon Sep 17 00:00:00 2001
+From 45eb4af45623cf627cbb873c20bc859ce05ade61 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit f75dd6d3b1215c2e7cdbdc290b5789517c8cfe10 ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -17,21 +19,13 @@
- config/arm/arm32_armv8_linux_gcc | 2 +-
- config/arm/arm64_armada_linux_gcc | 2 +-
- config/arm/arm64_armv8_linux_gcc | 2 +-
- config/arm/arm64_bluefield_linux_gcc | 2 +-
- config/arm/arm64_centriq2400_linux_gcc | 2 +-
- config/arm/arm64_cn10k_linux_gcc | 2 +-
- config/arm/arm64_cn9k_linux_gcc | 2 +-
- config/arm/arm64_dpaa_linux_gcc | 2 +-
- config/arm/arm64_emag_linux_gcc | 2 +-
- config/arm/arm64_graviton2_linux_gcc | 2 +-
- config/arm/arm64_kunpeng920_linux_gcc | 2 +-
- config/arm/arm64_kunpeng930_linux_gcc | 2 +-
- config/arm/arm64_n1sdp_linux_gcc | 2 +-
- config/arm/arm64_n2_linux_gcc | 2 +-
- config/arm/arm64_stingray_linux_gcc | 2 +-
- config/arm/arm64_thunderx2_linux_gcc | 2 +-
- config/arm/arm64_thunderxt83_linux_gcc | 2 +-
- config/arm/arm64_thunderxt88_linux_gcc | 2 +-
- config/ppc/ppc64le-power8-linux-gcc | 2 +-
- config/ppc/ppc64le-power8-linux-gcc-ubuntu | 2 +-
- 20 files changed, 20 insertions(+), 20 deletions(-)
+ config/arm/arm64_armada_linux_gcc | 2 +-
+ config/arm/arm64_armv8_linux_gcc | 2 +-
+ config/arm/arm64_bluefield_linux_gcc | 2 +-
+ config/arm/arm64_dpaa_linux_gcc | 2 +-
+ config/arm/arm64_emag_linux_gcc | 2 +-
+ config/arm/arm64_graviton2_linux_gcc | 2 +-
+ config/arm/arm64_n1sdp_linux_gcc | 2 +-
+ config/arm/arm64_octeontx2_linux_gcc | 2 +-
+ config/arm/arm64_stingray_linux_gcc | 2 +-
+ config/arm/arm64_thunderx2_linux_gcc | 2 +-
+ config/arm/arm64_thunderx_linux_gcc | 2 +-
+ config/ppc/ppc64le-power8-linux-gcc | 2 +-
+ 12 files changed, 12 insertions(+), 12 deletions(-)
@@ -39,12 +32,0 @@
-diff --git a/config/arm/arm32_armv8_linux_gcc b/config/arm/arm32_armv8_linux_gcc
-index 7f2977e49d..269a60ba19 100644
---- a/config/arm/arm32_armv8_linux_gcc
-+++ b/config/arm/arm32_armv8_linux_gcc
-@@ -1,6 +1,6 @@
- [binaries]
- c = ['ccache', 'arm-linux-gnueabihf-gcc']
--cpp = ['ccache', 'arm-linux-gnueabihf-cpp']
-+cpp = ['ccache', 'arm-linux-gnueabihf-g++']
- ar = 'arm-linux-gnueabihf-gcc-ar'
- strip = 'arm-linux-gnueabihf-strip'
- pkgconfig = 'arm-linux-gnueabihf-pkg-config'
@@ -52 +34 @@
-index 1566999101..635b4946a3 100644
+index fa40c0398f..d78c99e8e8 100644
@@ -57,3 +39,3 @@
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ c = 'aarch64-linux-gnu-gcc'
+-cpp = 'aarch64-linux-gnu-cpp'
++cpp = 'aarch64-linux-gnu-g++'
@@ -64 +46 @@
-index 048c2d9f29..529694b49d 100644
+index 88f0ff9dae..057d70bbdd 100644
@@ -69,3 +51,3 @@
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ c = 'aarch64-linux-gnu-gcc'
+-cpp = 'aarch64-linux-gnu-cpp'
++cpp = 'aarch64-linux-gnu-g++'
@@ -76 +58 @@
-index 38df3c198b..1286227915 100644
+index 86797d23cd..616e633495 100644
@@ -81,39 +63,3 @@
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
- ar = 'aarch64-linux-gnu-gcc-ar'
- strip = 'aarch64-linux-gnu-strip'
- pkgconfig = 'aarch64-linux-gnu-pkg-config'
-diff --git a/config/arm/arm64_centriq2400_linux_gcc b/config/arm/arm64_centriq2400_linux_gcc
-index 0966eef2c5..bc8737e072 100644
---- a/config/arm/arm64_centriq2400_linux_gcc
-+++ b/config/arm/arm64_centriq2400_linux_gcc
-@@ -1,6 +1,6 @@
- [binaries]
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
- ar = 'aarch64-linux-gnu-gcc-ar'
- strip = 'aarch64-linux-gnu-strip'
- pkgconfig = 'aarch64-linux-gnu-pkg-config'
-diff --git a/config/arm/arm64_cn10k_linux_gcc b/config/arm/arm64_cn10k_linux_gcc
-index 201e0ccd59..05d2d64cf2 100644
---- a/config/arm/arm64_cn10k_linux_gcc
-+++ b/config/arm/arm64_cn10k_linux_gcc
-@@ -1,6 +1,6 @@
- [binaries]
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
- ar = 'aarch64-linux-gnu-gcc-ar'
- strip = 'aarch64-linux-gnu-strip'
- pkgconfig = 'aarch64-linux-gnu-pkg-config'
-diff --git a/config/arm/arm64_cn9k_linux_gcc b/config/arm/arm64_cn9k_linux_gcc
-index a9b4d51958..7416454de0 100644
---- a/config/arm/arm64_cn9k_linux_gcc
-+++ b/config/arm/arm64_cn9k_linux_gcc
-@@ -1,6 +1,6 @@
- [binaries]
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ c = 'aarch64-linux-gnu-gcc'
+-cpp = 'aarch64-linux-gnu-cpp'
++cpp = 'aarch64-linux-gnu-g++'
@@ -124 +70 @@
-index 0d5761bd72..8465b5097b 100644
+index 1a46821543..0108bb952a 100644
@@ -129,3 +75,3 @@
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ c = 'aarch64-linux-gnu-gcc'
+-cpp = 'aarch64-linux-gnu-cpp'
++cpp = 'aarch64-linux-gnu-g++'
@@ -136 +82 @@
-index 16ec49fc32..248169ed68 100644
+index 8edcd3e976..3bb5134224 100644
@@ -141,3 +87,3 @@
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ c = 'aarch64-linux-gnu-gcc'
+-cpp = 'aarch64-linux-gnu-cpp'
++cpp = 'aarch64-linux-gnu-g++'
@@ -148 +94 @@
-index 094c540f50..fdb298bb11 100644
+index 022e063039..421d06c77f 100644
@@ -153,27 +99,3 @@
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
- ar = 'aarch64-linux-gnu-gcc-ar'
- strip = 'aarch64-linux-gnu-strip'
- pkgconfig = 'aarch64-linux-gnu-pkg-config'
-diff --git a/config/arm/arm64_kunpeng920_linux_gcc b/config/arm/arm64_kunpeng920_linux_gcc
-index fc057c9063..193fb48a61 100644
---- a/config/arm/arm64_kunpeng920_linux_gcc
-+++ b/config/arm/arm64_kunpeng920_linux_gcc
-@@ -1,6 +1,6 @@
- [binaries]
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
- ar = 'aarch64-linux-gnu-gcc-ar'
- strip = 'aarch64-linux-gnu-strip'
- pkgconfig = 'aarch64-linux-gnu-pkg-config'
-diff --git a/config/arm/arm64_kunpeng930_linux_gcc b/config/arm/arm64_kunpeng930_linux_gcc
-index 5f43941fae..e4281ceb4f 100644
---- a/config/arm/arm64_kunpeng930_linux_gcc
-+++ b/config/arm/arm64_kunpeng930_linux_gcc
-@@ -1,6 +1,6 @@
- [binaries]
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ c = 'aarch64-linux-gnu-gcc'
+-cpp = 'aarch64-linux-gnu-cpp'
++cpp = 'aarch64-linux-gnu-g++'
@@ -184 +106 @@
-index fc123ab53f..2806a4241b 100644
+index 022e063039..421d06c77f 100644
@@ -189,3 +111,3 @@
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ c = 'aarch64-linux-gnu-gcc'
+-cpp = 'aarch64-linux-gnu-cpp'
++cpp = 'aarch64-linux-gnu-g++'
@@ -195,4 +117,4 @@
-diff --git a/config/arm/arm64_n2_linux_gcc b/config/arm/arm64_n2_linux_gcc
-index 930bd5c236..7404bd197b 100644
---- a/config/arm/arm64_n2_linux_gcc
-+++ b/config/arm/arm64_n2_linux_gcc
+diff --git a/config/arm/arm64_octeontx2_linux_gcc b/config/arm/arm64_octeontx2_linux_gcc
+index 365bd7cbdd..0d7a66c97e 100644
+--- a/config/arm/arm64_octeontx2_linux_gcc
++++ b/config/arm/arm64_octeontx2_linux_gcc
@@ -201,3 +123,3 @@
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ c = 'aarch64-linux-gnu-gcc'
+-cpp = 'aarch64-linux-gnu-cpp'
++cpp = 'aarch64-linux-gnu-g++'
@@ -208 +130 @@
-index 5dfcd974fd..08148b5c3d 100644
+index 86797d23cd..616e633495 100644
@@ -213,3 +135,3 @@
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ c = 'aarch64-linux-gnu-gcc'
+-cpp = 'aarch64-linux-gnu-cpp'
++cpp = 'aarch64-linux-gnu-g++'
@@ -220 +142 @@
-index c1f5995d93..32ae938e95 100644
+index 2b41acc615..24346ffe71 100644
@@ -225,15 +147,3 @@
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
- ar = 'aarch64-linux-gnu-gcc-ar'
- strip = 'aarch64-linux-gnu-strip'
- pkgconfig = 'aarch64-linux-gnu-pkg-config'
-diff --git a/config/arm/arm64_thunderxt83_linux_gcc b/config/arm/arm64_thunderxt83_linux_gcc
-index 52746e2e59..e9d9e62d44 100644
---- a/config/arm/arm64_thunderxt83_linux_gcc
-+++ b/config/arm/arm64_thunderxt83_linux_gcc
-@@ -1,6 +1,6 @@
- [binaries]
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ c = 'aarch64-linux-gnu-gcc'
+-cpp = 'aarch64-linux-gnu-cpp'
++cpp = 'aarch64-linux-gnu-g++'
@@ -243,4 +153,4 @@
-diff --git a/config/arm/arm64_thunderxt88_linux_gcc b/config/arm/arm64_thunderxt88_linux_gcc
-index fed7eb791e..c6e5a5656a 100644
---- a/config/arm/arm64_thunderxt88_linux_gcc
-+++ b/config/arm/arm64_thunderxt88_linux_gcc
+diff --git a/config/arm/arm64_thunderx_linux_gcc b/config/arm/arm64_thunderx_linux_gcc
+index 6572ab615d..cbf60bac73 100644
+--- a/config/arm/arm64_thunderx_linux_gcc
++++ b/config/arm/arm64_thunderx_linux_gcc
@@ -249,3 +159,3 @@
- c = ['ccache', 'aarch64-linux-gnu-gcc']
--cpp = ['ccache', 'aarch64-linux-gnu-cpp']
-+cpp = ['ccache', 'aarch64-linux-gnu-g++']
+ c = 'aarch64-linux-gnu-gcc'
+-cpp = 'aarch64-linux-gnu-cpp'
++cpp = 'aarch64-linux-gnu-g++'
@@ -256 +166 @@
-index 465044e427..8c2db89382 100644
+index 51f7ceebf3..784c33df9e 100644
@@ -261,3 +171,3 @@
- c = ['ccache', 'powerpc64le-linux-gcc']
--cpp = ['ccache', 'powerpc64le-linux-cpp']
-+cpp = ['ccache', 'powerpc64le-linux-g++']
+ c = 'powerpc64le-linux-gcc'
+-cpp = 'powerpc64le-linux-cpp'
++cpp = 'powerpc64le-linux-g++'
@@ -266,12 +175,0 @@
-
-diff --git a/config/ppc/ppc64le-power8-linux-gcc-ubuntu b/config/ppc/ppc64le-power8-linux-gcc-ubuntu
-index 44d7e0100a..3027d66f8d 100644
---- a/config/ppc/ppc64le-power8-linux-gcc-ubuntu
-+++ b/config/ppc/ppc64le-power8-linux-gcc-ubuntu
-@@ -1,6 +1,6 @@
- [binaries]
- c = ['ccache', 'powerpc64le-linux-gnu-gcc']
--cpp = ['ccache', 'powerpc64le-linux-gnu-cpp']
-+cpp = ['ccache', 'powerpc64le-linux-gnu-g++']
- ar = 'powerpc64le-linux-gnu-ar'
- strip = 'powerpc64le-linux-gnu-strip'
More information about the stable
mailing list