Browse Source

libc-internal.h: use a consistent prototype for __stack_chk_fail

Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Peter S. Mazinger 13 years ago
parent
commit
0dd1ccafa7

+ 4 - 0
include/libc-internal.h

@@ -70,6 +70,10 @@ extern void __chk_fail(void) attribute_noreturn;
 libc_hidden_proto(__chk_fail)
 #  endif
 
+#  ifdef __UCLIBC_HAS_SSP__
+extern void __stack_chk_fail(void) attribute_noreturn __cold;
+#  endif
+
 # endif /* IS_IN_libc */
 
 #endif /* __ASSEMBLER__ */

+ 0 - 2
libc/sysdeps/linux/common/ssp-local.c

@@ -23,8 +23,6 @@
 
 #include <features.h>
 
-extern void __stack_chk_fail (void) attribute_noreturn;
-
 /* On some architectures, this helps needless PIC pointer setup
    that would be needed just for the __stack_chk_fail call.  */
 

+ 0 - 1
libc/sysdeps/linux/common/ssp.c

@@ -88,7 +88,6 @@ void __stack_smash_handler(char func[], int damaged)
 #endif
 
 #ifdef __UCLIBC_HAS_SSP__
-void __stack_chk_fail(void) attribute_noreturn __cold;
 void __stack_chk_fail(void)
 {
 	static const char msg1[] = "stack smashing detected: ";