From f8111809bae5bfe384bbbf59d59eb6ee4b16ec7f Mon Sep 17 00:00:00 2001 From: Filippo Arcidiacono Date: Tue, 8 May 2012 15:42:48 +0200 Subject: ldso: sh: handle _dl_skip_args in linker startup instead of __uClibc_main Handle _dl_skip_args in the asm part of the dynamic linker startup, to skip the ldso arguments, so we can keep this symbol hidden as other archs do. Signed-off-by: Filippo Arcidiacono Signed-off-by: Carmelo Amoroso --- libc/misc/internals/__uClibc_main.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'libc') diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 71fdbd8a7..8e9d58f7c 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -146,10 +146,6 @@ extern void (*__fini_array_end []) (void) attribute_hidden; # endif #endif -#if defined (__LDSO_STANDALONE_SUPPORT__) && defined (SHARED) && defined __sh__ -extern unsigned long _dl_skip_args; -#endif - attribute_hidden const char *__uclibc_progname = ""; #ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__ const char *program_invocation_short_name = ""; @@ -339,18 +335,6 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc, __rtld_fini = rtld_fini; -#if defined __LDSO_STANDALONE_SUPPORT__ && defined SHARED && defined __sh__ - /* - * Skip ld.so and its arguments - * Other archs except for SH do this in _dl_start before passing - * control to the application. - * FIXME: align SH _dl_start to other archs and remove this from here, - * so that we can keep the visibility hidden. - */ - argc -= _dl_skip_args; - argv += _dl_skip_args; -#endif - /* The environment begins right after argv. */ __environ = &argv[argc + 1]; -- cgit v1.2.3