From 6d11a8264eb5d2000910765e97e26641ff5505bf Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sat, 8 Oct 2005 14:40:04 +0000 Subject: User strong_alias instead of initializing __guard separately --- libc/misc/internals/__uClibc_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libc') 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 #include -/* 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 -- cgit v1.2.3