Skip to content

Commit 272248d

Browse files
Gary-Hobsonxiaoxiang781216
authored andcommitted
libc: compile stackchk function by default
Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
1 parent 279a676 commit 272248d

File tree

3 files changed

+2
-14
lines changed

3 files changed

+2
-14
lines changed

libs/libc/assert/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
#
1919
# ##############################################################################
2020

21-
set(SRCS lib_assert.c)
22-
23-
if(CONFIG_STACK_CANARIES)
24-
list(APPEND SRCS lib_stackchk.c)
25-
endif()
21+
set(SRCS lib_assert.c lib_stackchk.c)
2622

2723
if(CONFIG_ARCH_TOOLCHAIN_GNU AND NOT CONFIG_LTO_NONE)
2824
set_source_files_properties(lib_assert.c DIRECTORY .. PROPERTIES COMPILE_FLAGS

libs/libc/assert/Make.defs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818
#
1919
############################################################################
2020

21-
CSRCS += lib_assert.c
22-
23-
ifeq ($(CONFIG_STACK_CANARIES),y)
24-
CSRCS += lib_stackchk.c
25-
endif
21+
CSRCS += lib_assert.c lib_stackchk.c
2622

2723
ifeq ($(CONFIG_ARCH_TOOLCHAIN_GNU),y)
2824
ifeq ($(CONFIG_LTO_NONE),n)

libs/libc/assert/lib_stackchk.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
#include <assert.h>
2626

27-
#ifdef CONFIG_STACK_CANARIES
28-
2927
/****************************************************************************
3028
* Public Data
3129
****************************************************************************/
@@ -56,5 +54,3 @@ void __stack_chk_fail(void)
5654
{
5755
PANIC();
5856
}
59-
60-
#endif /* CONFIG_STACK_CANARIES */

0 commit comments

Comments
 (0)