svn commit: trunk/uClibc/libc/misc/internals

[psm at uclibc.org]

Author: psm
Date: 2005-10-08 07:40:04 -0700 (Sat, 08 Oct 2005)
New Revision: 11809

Log:
User strong_alias instead of initializing __guard separately

Modified:
   trunk/uClibc/libc/misc/internals/__uClibc_main.c


Changeset:
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c	2005-10-08 11:08:28 UTC (rev 11808)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c	2005-10-08 14:40:04 UTC (rev 11809)
@@ -29,10 +29,10 @@
 #include <ssp-internal.h>
 #include <stdint.h>
 
-/* for gcc-3.x + Etoh ssp */
-uintptr_t __guard attribute_relro;
 /* for gcc-4.1 non-TLS */
 uintptr_t __stack_chk_guard attribute_relro;
+/* for gcc-3.x + Etoh ssp */
+strong_alias(__stack_chk_guard,__guard)
 #endif
 
 /*
@@ -201,8 +201,6 @@
 
 #ifdef __UCLIBC_HAS_SSP__
     uintptr_t stack_chk_guard = _dl_guard_setup();
-    /* for gcc-3.x + Etoh ssp */
-    __guard = stack_chk_guard;
     /* for gcc-4.1 non-TLS */
     __stack_chk_guard = stack_chk_guard;
 #endif