diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2005-10-08 14:40:04 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2005-10-08 14:40:04 +0000 |
| commit | 6d11a8264eb5d2000910765e97e26641ff5505bf (patch) | |
| tree | d1106168febc7aa89b3f5377873a18491b627cd9 | |
| parent | ded4332183bf5e662c30694237a8fe31b840fdf4 (diff) | |
User strong_alias instead of initializing __guard separately
| -rw-r--r-- | libc/misc/internals/__uClibc_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index a1a813c0e..4e2960918 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -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 @@ void __uClibc_init(void) #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 |