diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-01-25 06:12:08 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-01-25 06:16:56 +0100 |
| commit | 74ca0c98cb8b4e6f75858ca2b2746744f2558493 (patch) | |
| tree | 2999b63239b319ac416e5af7ee4a1e5a80a3ad11 /libc/misc/internals | |
| parent | e64b864d6d4e020a94d3931704ccea50d1a20b82 (diff) | |
| parent | c4b750195714ec7c10aa4de15610c5aae0751c1c (diff) | |
Merge branch 'master' into nptl
Conflicts:
libc/inet/Makefile.in
libc/inet/hostid.c
Synchronise nptl branch with master branch @ c4b750195714ec7c10aa4de15610c5aae0751c1c
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libc/misc/internals')
| -rw-r--r-- | libc/misc/internals/__uClibc_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index cb2c6ed14..c5feedeba 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -271,10 +271,11 @@ libc_hidden_def(__uClibc_fini) */ void __uClibc_main(int (*main)(int, char **, char **), int argc, char **argv, void (*app_init)(void), void (*app_fini)(void), - void (*rtld_fini)(void), void *stack_end) attribute_noreturn; + void (*rtld_fini)(void), + void *stack_end attribute_unused) attribute_noreturn; void __uClibc_main(int (*main)(int, char **, char **), int argc, char **argv, void (*app_init)(void), void (*app_fini)(void), - void (*rtld_fini)(void), void *stack_end) + void (*rtld_fini)(void), void *stack_end attribute_unused) { #ifndef __ARCH_HAS_NO_LDSO__ unsigned long *aux_dat; |