svn commit: trunk/uClibc: ldso/ldso libc/sysdeps/linux/common
psm at uclibc.org
psm at uclibc.org
Wed Nov 2 16:21:21 UTC 2005
Author: psm
Date: 2005-11-02 08:21:19 -0800 (Wed, 02 Nov 2005)
New Revision: 12111
Log:
Move __SSP__ check to header
Modified:
trunk/uClibc/ldso/ldso/ldso.c
trunk/uClibc/libc/sysdeps/linux/common/dl-osinfo.h
Changeset:
Modified: trunk/uClibc/ldso/ldso/ldso.c
===================================================================
--- trunk/uClibc/ldso/ldso/ldso.c 2005-11-02 16:13:41 UTC (rev 12110)
+++ trunk/uClibc/ldso/ldso/ldso.c 2005-11-02 16:21:19 UTC (rev 12111)
@@ -86,9 +86,6 @@
extern void _start(void);
#ifdef __UCLIBC_HAS_SSP__
-#ifdef __SSP__
-#error "file must not be compiled with stack protection enabled on it. Use -fno-stack-protector"
-#endif
#include <dl-osinfo.h>
#ifndef THREAD_SET_STACK_GUARD
/* Only exported for architectures that don't store the stack guard canary
Modified: trunk/uClibc/libc/sysdeps/linux/common/dl-osinfo.h
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/dl-osinfo.h 2005-11-02 16:13:41 UTC (rev 12110)
+++ trunk/uClibc/libc/sysdeps/linux/common/dl-osinfo.h 2005-11-02 16:21:19 UTC (rev 12111)
@@ -24,6 +24,9 @@
#define GETTIMEOFDAY gettimeofday
#endif
#else
+#ifdef __SSP__
+#error "file must not be compiled with stack protection enabled on it. Use -fno-stack-protector"
+#endif
#ifndef __SSP_QUICK_CANARY__
#define OPEN _dl_open
#define READ _dl_read
More information about the uClibc-cvs
mailing list