From d3fb23cca06580b6e447a9476a9c16643c4ea8fe Mon Sep 17 00:00:00 2001
From: zhushengle <zhushengle@huawei.com>
Date: Wed, 21 Jul 2021 11:12:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20riscv=5Fnuclei=20=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

riscv_nuclei编译失败原因:
1.采用Makefile编译，未包含power模块
2.安全函数库重复包含，导致链接时报重定义错误

Close #I41PQJ
Signed-off-by: zhushengle <zhushengle@huawei.com>
Change-Id: Id3d20cdb6050fa01aff432be8a9e21dc3c590e29
---
 targets/riscv_nuclei_demo_soc_gcc/GCC/liteos_m.mk      | 6 +++---
 targets/riscv_nuclei_gd32vf103_soc_gcc/GCC/liteos_m.mk | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/targets/riscv_nuclei_demo_soc_gcc/GCC/liteos_m.mk b/targets/riscv_nuclei_demo_soc_gcc/GCC/liteos_m.mk
index d2ff581b..fa673356 100644
--- a/targets/riscv_nuclei_demo_soc_gcc/GCC/liteos_m.mk
+++ b/targets/riscv_nuclei_demo_soc_gcc/GCC/liteos_m.mk
@@ -6,14 +6,14 @@ C_SOURCES     += $(wildcard $(LITEOSTOPDIR)/kernel/src/*.c) \
                  $(wildcard $(LITEOSTOPDIR)/kernel/src/mm/*.c) \
                  $(wildcard $(LITEOSTOPDIR)/components/cpup/*.c) \
                  $(wildcard $(LITEOSTOPDIR)/components/los_backtrace/*.c) \
-                 $(wildcard $(LITEOSTOPDIR)/../../third_party/bounds_checking_function/src/*.c) \
-                 $(wildcard $(LITEOSTOPDIR)/utils/*.c) 
+                 $(wildcard $(LITEOSTOPDIR)/components/power/*.c) \
+                 $(wildcard $(LITEOSTOPDIR)/utils/*.c)
 
 C_INCLUDES    += -I$(LITEOSTOPDIR)/utils \
                  -I$(LITEOSTOPDIR)/kernel/include \
                  -I$(LITEOSTOPDIR)/components/cpup \
                  -I$(LITEOSTOPDIR)/components/los_backtrace \
-                 -I$(LITEOSTOPDIR)/../../third_party/bounds_checking_function/include
+                 -I$(LITEOSTOPDIR)/components/power
 
 #third party related
 C_INCLUDES    += -I$(LITEOSTOPDIR)/../../third_party/bounds_checking_function/include \
diff --git a/targets/riscv_nuclei_gd32vf103_soc_gcc/GCC/liteos_m.mk b/targets/riscv_nuclei_gd32vf103_soc_gcc/GCC/liteos_m.mk
index be37dc16..c6202e32 100644
--- a/targets/riscv_nuclei_gd32vf103_soc_gcc/GCC/liteos_m.mk
+++ b/targets/riscv_nuclei_gd32vf103_soc_gcc/GCC/liteos_m.mk
@@ -6,14 +6,14 @@ C_SOURCES     += $(wildcard $(LITEOSTOPDIR)/kernel/src/*.c) \
                  $(wildcard $(LITEOSTOPDIR)/kernel/src/mm/*.c) \
                  $(wildcard $(LITEOSTOPDIR)/components/cpup/*.c) \
                  $(wildcard $(LITEOSTOPDIR)/components/backtrace/*.c) \
-                 $(wildcard $(LITEOSTOPDIR)/../../third_party/bounds_checking_function/src/*.c) \
+                 $(wildcard $(LITEOSTOPDIR)/components/power/*.c) \
                  $(wildcard $(LITEOSTOPDIR)/utils/*.c) 
 
 C_INCLUDES    += -I$(LITEOSTOPDIR)/utils \
                  -I$(LITEOSTOPDIR)/kernel/include \
                  -I$(LITEOSTOPDIR)/components/cpup \
                  -I$(LITEOSTOPDIR)/components/backtrace \
-                 -I$(LITEOSTOPDIR)/../../third_party/bounds_checking_function/include
+                 -I$(LITEOSTOPDIR)/components/power
 
 #third party related
 C_INCLUDES    += -I$(LITEOSTOPDIR)/../../third_party/bounds_checking_function/include \