svn commit: branches/uClibc_0_9_30/ldso/ldso

[aldot at uclibc.org]

Author: aldot
Date: 2009-02-23 08:38:23 +0000 (Mon, 23 Feb 2009)
New Revision: 25418

Log:
- fix weak ssp symbol on some arches (Peter S. Mazinger) (r25417 from trunk)
  Work around alleged binutils glitch with weak symbols on some arches.
  See binutils ML, weak psm and vapier.


Modified:
   branches/uClibc_0_9_30/ldso/ldso/ldso.c


Changeset:
Modified: branches/uClibc_0_9_30/ldso/ldso/ldso.c
===================================================================
--- branches/uClibc_0_9_30/ldso/ldso/ldso.c	2009-02-23 08:37:35 UTC (rev 25417)
+++ branches/uClibc_0_9_30/ldso/ldso/ldso.c	2009-02-23 08:38:23 UTC (rev 25418)
@@ -97,15 +97,13 @@
 
 #ifdef __UCLIBC_HAS_SSP__
 # include <dl-osinfo.h>
-uintptr_t stack_chk_guard;
+static uintptr_t stack_chk_guard;
 # ifndef THREAD_SET_STACK_GUARD
 /* Only exported for architectures that don't store the stack guard canary
  * in local thread area.  */
 uintptr_t __stack_chk_guard attribute_relro;
-#  ifdef __UCLIBC_HAS_SSP_COMPAT__
-strong_alias(__stack_chk_guard,__guard)
-#  endif
-# elif defined __UCLIBC_HAS_SSP_COMPAT__
+# endif
+# ifdef __UCLIBC_HAS_SSP_COMPAT__
 uintptr_t __guard attribute_relro;
 # endif
 #endif
@@ -233,12 +231,12 @@
 	stack_chk_guard = _dl_setup_stack_chk_guard ();
 # ifdef THREAD_SET_STACK_GUARD
 	THREAD_SET_STACK_GUARD (stack_chk_guard);
-#  ifdef __UCLIBC_HAS_SSP_COMPAT__
-	__guard = stack_chk_guard;
-#  endif
 # else
 	__stack_chk_guard = stack_chk_guard;
 # endif
+# ifdef __UCLIBC_HAS_SSP_COMPAT__
+	__guard = stack_chk_guard;
+# endif
 #endif
 
 	/* At this point we are now free to examine the user application,