diff options
| -rw-r--r-- | ldso/ldso/arm/dl-startup.h | 6 | ||||
| -rw-r--r-- | ldso/ldso/cris/dl-startup.h | 5 | ||||
| -rw-r--r-- | ldso/ldso/dl-startup.c | 6 | ||||
| -rw-r--r-- | ldso/ldso/i386/dl-startup.h | 5 | ||||
| -rw-r--r-- | ldso/ldso/m68k/dl-startup.h | 5 | ||||
| -rw-r--r-- | ldso/ldso/mips/dl-startup.h | 10 | ||||
| -rw-r--r-- | ldso/ldso/powerpc/dl-startup.h | 6 | ||||
| -rw-r--r-- | ldso/ldso/sh/dl-startup.h | 8 | ||||
| -rw-r--r-- | ldso/ldso/sh64/dl-startup.h | 9 | ||||
| -rw-r--r-- | ldso/ldso/x86_64/dl-startup.h | 5 |
10 files changed, 6 insertions, 59 deletions
diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h index b7ab57b0c..8ebc0b288 100644 --- a/ldso/ldso/arm/dl-startup.h +++ b/ldso/ldso/arm/dl-startup.h @@ -115,9 +115,3 @@ void PERFORM_BOOTSTRAP_RELOC(ELF_RELOC *rpnt, unsigned long *reloc_addr, _dl_exit(1); } } - - -/* Transfer control to the user's application, once the dynamic loader is - * done. This routine has to exit the current function, then call the - * _dl_elf_main function. */ -#define START() return _dl_elf_main; diff --git a/ldso/ldso/cris/dl-startup.h b/ldso/ldso/cris/dl-startup.h index 191657a43..3274b41a5 100644 --- a/ldso/ldso/cris/dl-startup.h +++ b/ldso/ldso/cris/dl-startup.h @@ -58,8 +58,3 @@ void PERFORM_BOOTSTRAP_RELOC(ELF_RELOC *rpnt, unsigned long *reloc_addr, break; } } - -/* Transfer control to the user's application, once the dynamic loader is - * done. This routine has to exit the current function, then call the - * _dl_elf_main function. */ -#define START() return _dl_elf_main diff --git a/ldso/ldso/dl-startup.c b/ldso/ldso/dl-startup.c index ef8e71698..cc1bd04d1 100644 --- a/ldso/ldso/dl-startup.c +++ b/ldso/ldso/dl-startup.c @@ -307,5 +307,11 @@ static void * __attribute_used__ _dl_start(unsigned long args) SEND_STDERR_DEBUG("transfering control to application @ "); _dl_elf_main = (int (*)(int, char **, char **)) auxvt[AT_ENTRY].a_un.a_val; SEND_ADDRESS_STDERR_DEBUG(_dl_elf_main, 1); + +#ifndef START + return _dl_elf_main; +#else +#warning You need to update your arch ldso code START(); +#endif } diff --git a/ldso/ldso/i386/dl-startup.h b/ldso/ldso/i386/dl-startup.h index cfa412621..d3c7109d9 100644 --- a/ldso/ldso/i386/dl-startup.h +++ b/ldso/ldso/i386/dl-startup.h @@ -64,8 +64,3 @@ void PERFORM_BOOTSTRAP_RELOC(ELF_RELOC *rpnt, unsigned long *reloc_addr, _dl_exit(1); } } - -/* Transfer control to the user's application, once the dynamic loader is - * done. This routine has to exit the current function, then call the - * _dl_elf_main function. */ -#define START() return _dl_elf_main diff --git a/ldso/ldso/m68k/dl-startup.h b/ldso/ldso/m68k/dl-startup.h index bd748b778..fca4b6ccb 100644 --- a/ldso/ldso/m68k/dl-startup.h +++ b/ldso/ldso/m68k/dl-startup.h @@ -84,8 +84,3 @@ void PERFORM_BOOTSTRAP_RELOC(ELF_RELOC *rpnt, unsigned long *reloc_addr, _dl_exit (1); } } - -/* Transfer control to the user's application, once the dynamic loader is - * done. This routine has to exit the current function, then call the - * _dl_elf_main function. */ -#define START() return _dl_elf_main diff --git a/ldso/ldso/mips/dl-startup.h b/ldso/ldso/mips/dl-startup.h index df2f25a14..bf461d3b8 100644 --- a/ldso/ldso/mips/dl-startup.h +++ b/ldso/ldso/mips/dl-startup.h @@ -136,13 +136,3 @@ do { \ SEND_STDERR("Aiieeee!"); \ _dl_exit(1); \ } - - -/* - * Transfer control to the user's application, once the dynamic loader - * is done. This routine has to exit the current function, then - * call the _dl_elf_main function. For MIPS, we do it in assembly - * because the stack doesn't get properly restored otherwise. Got look - * at boot1_arch.h - */ -#define START() return _dl_elf_main diff --git a/ldso/ldso/powerpc/dl-startup.h b/ldso/ldso/powerpc/dl-startup.h index e6fd814e5..becfa191e 100644 --- a/ldso/ldso/powerpc/dl-startup.h +++ b/ldso/ldso/powerpc/dl-startup.h @@ -80,9 +80,3 @@ asm( _dl_exit(100+ELF32_R_TYPE((RELP)->r_info));\ } \ } -/* - * Transfer control to the user's application, once the dynamic loader - * is done. This routine has to exit the current function, then - * call the _dl_elf_main function. - */ -#define START() return _dl_elf_main diff --git a/ldso/ldso/sh/dl-startup.h b/ldso/ldso/sh/dl-startup.h index 60808f2df..63a65940c 100644 --- a/ldso/ldso/sh/dl-startup.h +++ b/ldso/ldso/sh/dl-startup.h @@ -55,11 +55,3 @@ asm( default: \ _dl_exit(1); \ } - - -/* - * Transfer control to the user's application, once the dynamic loader - * is done. This routine has to exit the current function, then - * call the _dl_elf_main function. - */ -#define START() return _dl_elf_main; diff --git a/ldso/ldso/sh64/dl-startup.h b/ldso/ldso/sh64/dl-startup.h index d40344d08..7701afc71 100644 --- a/ldso/ldso/sh64/dl-startup.h +++ b/ldso/ldso/sh64/dl-startup.h @@ -115,12 +115,3 @@ asm("" \ default: \ _dl_exit(1); \ } - -/* - * Transfer control to the user's application, once the dynamic loader - * is done. This routine has to exit the current function, then - * call the _dl_elf_main function. - */ - -#define START() return _dl_elf_main; - diff --git a/ldso/ldso/x86_64/dl-startup.h b/ldso/ldso/x86_64/dl-startup.h index 94d7fd41e..d58da554b 100644 --- a/ldso/ldso/x86_64/dl-startup.h +++ b/ldso/ldso/x86_64/dl-startup.h @@ -63,8 +63,3 @@ void PERFORM_BOOTSTRAP_RELOC(ELF_RELOC *rpnt, ElfW(Addr) *reloc_addr, _dl_exit(1); } } - -/* Transfer control to the user's application, once the dynamic loader is - * done. This routine has to exit the current function, then call the - * _dl_elf_main function. */ -#define START() return _dl_elf_main |