michaelh/zephyr
1
0
Fork 0
Code Releases Activity

remove redundant checking for CONFIG_STACK_CANARIES

Browse source 
The file is already guarded with

obj-$(CONFIG_STACK_CANARIES) += compiler_stack_protect.o

So no need to check for CONFIG_STACK_CANARIES again in the file itself.

Change-Id: I09cf274679a1678f02478fca799a3f6507e77211
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2016-01-30 09:48:38 -05:00 • committed by Gerrit Code Review
commit 1e825f9c0f
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kernel/nanokernel/compiler_stack_protect.c
View file

@ -28,8 +28,6 @@
#include <toolchain.h> /* compiler specific configurations */ #include <toolchain.h> /* compiler specific configurations */
#if defined(CONFIG_STACK_CANARIES)
#include <nano_private.h> #include <nano_private.h>
#include <toolchain.h> #include <toolchain.h>
#include <sections.h> #include <sections.h>
@ -50,10 +48,6 @@ void FUNC_NORETURN _StackCheckHandler(void)
_NanoFatalErrorHandler(_NANO_ERR_STACK_CHK_FAIL, &_default_esf); _NanoFatalErrorHandler(_NANO_ERR_STACK_CHK_FAIL, &_default_esf);
} }
#endif /* CONFIG_STACK_CANARIES */
#ifdef CONFIG_STACK_CANARIES
/* Global variable */ /* Global variable */
/* /*
@ -70,4 +64,3 @@ void __noinit *__stack_chk_guard;
* a buffer overflow or stack corruption problem. * a buffer overflow or stack corruption problem.
*/ */
FUNC_ALIAS(_StackCheckHandler, __stack_chk_fail, void); FUNC_ALIAS(_StackCheckHandler, __stack_chk_fail, void);
#endif