diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-04 00:42:09 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-10-04 00:42:09 +0000 |
| commit | 9c5f0fd6e767713360a48b76a68a4f5febe100da (patch) | |
| tree | e1a05ae02c3858393688196679a41fd21bf7a18b /libc/misc/internals/__uClibc_main.c | |
| parent | f3cacffe54fb2644fcf6dee57b5768af4e32e797 (diff) | |
| download | uClibc-alpine-9c5f0fd6e767713360a48b76a68a4f5febe100da.tar.bz2 uClibc-alpine-9c5f0fd6e767713360a48b76a68a4f5febe100da.tar.xz | |
Bring in changes from trunk.
Diffstat (limited to 'libc/misc/internals/__uClibc_main.c')
| -rw-r--r-- | libc/misc/internals/__uClibc_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 8ed1f8d71..9dad20efa 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -30,9 +30,9 @@ #include <stdint.h> /* for gcc-3.x + Etoh ssp */ -uintptr_t __guard /* segfaults with attribute_relro */; +uintptr_t __guard attribute_relro; /* for gcc-4.1 non-TLS */ -uintptr_t __stack_chk_guard /* attribute_relro */; +uintptr_t __stack_chk_guard attribute_relro; #endif /* @@ -53,7 +53,6 @@ extern void weak_function __pthread_initialize_minimal(void); - /* * Declare the __environ global variable and create a weak alias environ. * Note: Apparently we must initialize __environ to ensure that the weak |