Browse Source

since just about everyone uses return _dl_elf_main for START() now, make it the default

Mike Frysinger 19 years ago
parent
commit
0d2b685bb7

+ 0 - 6
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;

+ 0 - 5
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

+ 6 - 0
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
 }

+ 0 - 5
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

+ 0 - 5
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

+ 0 - 10
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

+ 0 - 6
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

+ 0 - 8
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;

+ 0 - 9
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;
-

+ 0 - 5
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