From 533a7319d9a0f2b5155d923de6a7dfafb21675dd Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sat, 20 Feb 2021 20:00:57 +0800
Subject: [PATCH] libc: Move stack check stuff from libc/stdlib/ to
 libc/assert/

since the new location is more reasonable

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 libs/libc/assert/Make.defs                  | 4 ++++
 libs/libc/{stdlib => assert}/lib_stackchk.c | 2 +-
 libs/libc/stdlib/Make.defs                  | 4 ----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename libs/libc/{stdlib => assert}/lib_stackchk.c (98%)

diff --git a/libs/libc/assert/Make.defs b/libs/libc/assert/Make.defs
index d355f17ba0..dfe45759d4 100644
--- a/libs/libc/assert/Make.defs
+++ b/libs/libc/assert/Make.defs
@@ -20,6 +20,10 @@
 
 CSRCS += lib_assert.c
 
+ifeq ($(CONFIG_STACK_CANARIES),y)
+CSRCS += lib_stackchk.c
+endif
+
 # Add the assert directory to the build
 
 DEPPATH += --dep-path assert
diff --git a/libs/libc/stdlib/lib_stackchk.c b/libs/libc/assert/lib_stackchk.c
similarity index 98%
rename from libs/libc/stdlib/lib_stackchk.c
rename to libs/libc/assert/lib_stackchk.c
index 390ac9a13d..cf5751705f 100644
--- a/libs/libc/stdlib/lib_stackchk.c
+++ b/libs/libc/assert/lib_stackchk.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdlib/lib_stackchk.c
+ * libs/libc/assert/lib_stackchk.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/libs/libc/stdlib/Make.defs b/libs/libc/stdlib/Make.defs
index 2a5bcb761a..7c86976a73 100644
--- a/libs/libc/stdlib/Make.defs
+++ b/libs/libc/stdlib/Make.defs
@@ -36,10 +36,6 @@ ifeq ($(CONFIG_PSEUDOTERM_SUSV1),y)
 CSRCS += lib_ptsname.c lib_ptsnamer.c
 endif
 
-ifeq ($(CONFIG_STACK_CANARIES),y)
-CSRCS += lib_stackchk.c
-endif
-
 ifeq ($(CONFIG_PSEUDOTERM),y)
 CSRCS += lib_unlockpt.c
 endif