From 272248de372f0ea5da79fba650080f5fe45a8e25 Mon Sep 17 00:00:00 2001
From: yinshengkai <yinshengkai@xiaomi.com>
Date: Thu, 30 May 2024 11:40:04 +0800
Subject: [PATCH] libc: compile stackchk function by default

Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
---
 libs/libc/assert/CMakeLists.txt | 6 +-----
 libs/libc/assert/Make.defs      | 6 +-----
 libs/libc/assert/lib_stackchk.c | 4 ----
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/libs/libc/assert/CMakeLists.txt b/libs/libc/assert/CMakeLists.txt
index e2b2f9a034..df09c1057e 100644
--- a/libs/libc/assert/CMakeLists.txt
+++ b/libs/libc/assert/CMakeLists.txt
@@ -18,11 +18,7 @@
 #
 # ##############################################################################
 
-set(SRCS lib_assert.c)
-
-if(CONFIG_STACK_CANARIES)
-  list(APPEND SRCS lib_stackchk.c)
-endif()
+set(SRCS lib_assert.c lib_stackchk.c)
 
 if(CONFIG_ARCH_TOOLCHAIN_GNU AND NOT CONFIG_LTO_NONE)
   set_source_files_properties(lib_assert.c DIRECTORY .. PROPERTIES COMPILE_FLAGS
diff --git a/libs/libc/assert/Make.defs b/libs/libc/assert/Make.defs
index 4b236fd02a..83f6dbf493 100644
--- a/libs/libc/assert/Make.defs
+++ b/libs/libc/assert/Make.defs
@@ -18,11 +18,7 @@
 #
 ############################################################################
 
-CSRCS += lib_assert.c
-
-ifeq ($(CONFIG_STACK_CANARIES),y)
-CSRCS += lib_stackchk.c
-endif
+CSRCS += lib_assert.c lib_stackchk.c
 
 ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
   ifeq ($(CONFIG_LTO_NONE),n)
diff --git a/libs/libc/assert/lib_stackchk.c b/libs/libc/assert/lib_stackchk.c
index cf5751705f..0e2a15136f 100644
--- a/libs/libc/assert/lib_stackchk.c
+++ b/libs/libc/assert/lib_stackchk.c
@@ -24,8 +24,6 @@
 
 #include <assert.h>
 
-#ifdef CONFIG_STACK_CANARIES
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/
@@ -56,5 +54,3 @@ void __stack_chk_fail(void)
 {
   PANIC();
 }
-
-#endif /* CONFIG_STACK_CANARIES */