[git commit prelink 1/1] libm: disable tail jump trick if __SSP_ALL__ (was using wrong conditional)

Denys Vlasenko vda.linux at googlemail.com
Sun Nov 28 19:50:38 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=4d537e8547b8d623e1847cd80d3da455dc52ff85
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/prelink

Thanks, Timo!

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 docs/defines.txt        |    4 ++++
 libm/ldouble_wrappers.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/docs/defines.txt b/docs/defines.txt
index 8f37788..6e4a604 100644
--- a/docs/defines.txt
+++ b/docs/defines.txt
@@ -79,3 +79,7 @@ _IEEE_LIBM
     Always defined at libm build time
 __LDBL_COMPAT
     Never defined, TODO: remove?
+
+__SSP_ALL__
+    All functions, even small ones, have stack smashing protection
+    prologue enabled.
diff --git a/libm/ldouble_wrappers.c b/libm/ldouble_wrappers.c
index e2d4d80..0fe6e8d 100644
--- a/libm/ldouble_wrappers.c
+++ b/libm/ldouble_wrappers.c
@@ -37,7 +37,7 @@ long long func##l(long double x) \
 	return func((double) x); \
 }
 
-#if defined __i386__ && defined __OPTIMIZE__ && !defined __UCLIBC_HAS_SSP__
+#if defined __i386__ && defined __OPTIMIZE__ && !defined __SSP_ALL__
 # undef WRAPPER1
 # undef int_WRAPPER1
 # undef long_WRAPPER1
-- 
1.7.2.2



More information about the uClibc-cvs mailing list