From c52fed281c0e6f5e286664aa79d0dfb29891191d Mon Sep 17 00:00:00 2001
From: Jiangfeng Xiao <xiaojiangfeng@huawei.com>
Date: Mon, 13 Dec 2021 17:55:41 +0800
Subject: [PATCH] modify yocto code for openeuler gcc upgrading

Signed-off-by: Jiangfeng Xiao <xiaojiangfeng@huawei.com>
---
 meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb                   | 2 +-
 meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross.bb | 3 +++
 meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain.inc      | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb b/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb
index 66b8af92b26..7f21b9c1946 100644
--- a/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb
+++ b/meta-openeuler/recipes-core/lxc/lxc_4.0.3.bb
@@ -57,4 +57,4 @@ inherit autotools
 
 BBCLASSEXTEND = "native nativesdk"
 
-
+CFLAGS_append = "-Wno-error=stringop-overflow"
diff --git a/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross.bb b/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross.bb
index cd2055d8806..b561bdbb42b 100644
--- a/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross.bb
+++ b/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain-cross.bb
@@ -22,6 +22,9 @@ libexecdir = "${STAGING_DIR_NATIVE}/${prefix_native}/libexec/"
 do_install_class-cross() {
     install -m 0755 -d ${D}/${STAGING_DIR_NATIVE}
     cp -pPR ${B}/* ${D}/${STAGING_DIR_NATIVE}
+    if [ ${TOOLCHAIN_PREFIX}- == ${TARGET_PREFIX} ]; then
+	return
+    fi
     for f in ${D}/${STAGING_DIR_NATIVE}/bin/${TOOLCHAIN_PREFIX}-*; do
         bin=$(basename ${f})
         lnk=$(basename ${f} | sed "s/^${TOOLCHAIN_PREFIX}-/${TARGET_PREFIX}/g")
diff --git a/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain.inc b/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain.inc
index f4ff4f66886..4f0e7a9efba 100644
--- a/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain.inc
+++ b/meta-openeuler/recipes-devtools/gcc/gcc-bin-toolchain.inc
@@ -2,7 +2,7 @@ TOOLCHAIN_GCC_VERSION = "10.3.0"
 LICENSE = "CLOSED"
 SECTION = "toolchain"
 
-TOOLCHAIN_PREFIX_arm = "arm-linux-gnueabi"
+TOOLCHAIN_PREFIX_arm = "arm-openeuler-linux-gnueabi"
 TOOLCHAIN_PREFIX_aarch64 = "aarch64-openeuler-linux-gnu"
 EULER_TOOLCHAIN_GCC_PATH_INNER = "${TOOLCHAIN_PREFIX}/${TOOLCHAIN_GCC_VERSION}"
 EULER_TOOLCHAIN_GCC_PATH = "/gcc/${EULER_TOOLCHAIN_GCC_PATH_INNER}"
-- 
Gitee