From 840e2c0e50e0e8e44adadd4fdda7354a9727dc55 Mon Sep 17 00:00:00 2001
From: Renz Bagaporo <renz.bagaporo@espressif.com>
Date: Tue, 26 Jan 2021 11:37:25 +0800
Subject: [PATCH] esp_common: move stack check

---
 components/esp_common/src/stack_check.c | 40 -------------------------
 components/esp_system/component.mk      |  2 +-
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 components/esp_common/src/stack_check.c

diff --git a/components/esp_common/src/stack_check.c b/components/esp_common/src/stack_check.c
deleted file mode 100644
index cffff6555a..0000000000
--- a/components/esp_common/src/stack_check.c
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2017 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "sdkconfig.h"
-#include "esp_system.h"
-#include "esp_rom_sys.h"
-
-#if CONFIG_COMPILER_STACK_CHECK
-
-#define LOG_LOCAL_LEVEL CONFIG_LOG_DEFAULT_LEVEL
-#include "esp_log.h"
-const static char *TAG = "stack_chk";
-
-void *__stack_chk_guard = NULL;
-
-static void __attribute__ ((constructor))
-__esp_stack_guard_setup (void)
-{
-    ESP_LOGD(TAG, "Intialize random stack guard");
-    __stack_chk_guard = (void *)esp_random();
-}
-
-void __stack_chk_fail (void)
-{
-    esp_rom_printf("\r\nStack smashing protect failure!\r\n\r\n");
-    abort();
-}
-
-#endif
diff --git a/components/esp_system/component.mk b/components/esp_system/component.mk
index d78bcef737..e3ca1f7318 100644
--- a/components/esp_system/component.mk
+++ b/components/esp_system/component.mk
@@ -8,4 +8,4 @@ COMPONENT_ADD_LDFRAGMENTS += linker.lf
 include $(COMPONENT_PATH)/port/soc/$(SOC_NAME)/component.mk
 
 # disable stack protection in files which are involved in initialization of that feature
-startup.o: CFLAGS := $(filter-out -fstack-protector%, $(CFLAGS))
+startup.o stack_check.o: CFLAGS := $(filter-out -fstack-protector%, $(CFLAGS))