diff options
Diffstat (limited to 'lib/csu/arm')
| -rw-r--r-- | lib/csu/arm/Makefile | 4 | ||||
| -rw-r--r-- | lib/csu/arm/Makefile.depend | 1 | ||||
| -rw-r--r-- | lib/csu/arm/crt.h | 1 | ||||
| -rw-r--r-- | lib/csu/arm/crt1_c.c | 34 | ||||
| -rw-r--r-- | lib/csu/arm/crt1_s.S | 2 | ||||
| -rw-r--r-- | lib/csu/arm/crti.S | 2 | ||||
| -rw-r--r-- | lib/csu/arm/crtn.S | 2 |
7 files changed, 7 insertions, 39 deletions
diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile index 666bf569b786..5f5de9f9c61a 100644 --- a/lib/csu/arm/Makefile +++ b/lib/csu/arm/Makefile @@ -1,9 +1,5 @@ -# $FreeBSD$ - .PATH: ${.CURDIR:H}/common -CFLAGS+= -DCRT_IRELOC_SUPPRESS - CRT1OBJS+= crt1_s.o .include <bsd.lib.mk> diff --git a/lib/csu/arm/Makefile.depend b/lib/csu/arm/Makefile.depend index 79506ce16b79..993ab0638f4a 100644 --- a/lib/csu/arm/Makefile.depend +++ b/lib/csu/arm/Makefile.depend @@ -1,4 +1,3 @@ -# $FreeBSD$ # Autogenerated - do NOT edit! DIRDEPS = \ diff --git a/lib/csu/arm/crt.h b/lib/csu/arm/crt.h index 9f41c2fac0fe..d3dcf25e9039 100644 --- a/lib/csu/arm/crt.h +++ b/lib/csu/arm/crt.h @@ -1,2 +1 @@ -/* $FreeBSD$ */ /* Empty so we can include this unconditionally */ diff --git a/lib/csu/arm/crt1_c.c b/lib/csu/arm/crt1_c.c index 9725f173ff78..bb40f262f5c2 100644 --- a/lib/csu/arm/crt1_c.c +++ b/lib/csu/arm/crt1_c.c @@ -41,55 +41,35 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/elf_common.h> -#include <stdlib.h> #include "libc_private.h" -#include "ignore_init.c" +#include "csu_common.h" struct Struct_Obj_Entry; struct ps_strings; -extern void _start(int, char **, char **, const struct Struct_Obj_Entry *, - void (*)(void), struct ps_strings *); - -#ifdef GCRT -extern void _mcleanup(void); -extern void monstartup(void *, void *); -extern int eprol; -extern int etext; -#endif +void _start(int, char **, char **, const struct Struct_Obj_Entry *, + void (*)(void), struct ps_strings *) __dead2; struct ps_strings *__ps_strings; void __start(int, char **, char **, struct ps_strings *, - const struct Struct_Obj_Entry *, void (*)(void)); + const struct Struct_Obj_Entry *, void (*)(void)) __dead2; -/* ARGSUSED */ void __start(int argc, char **argv, char **env, struct ps_strings *ps_strings, const struct Struct_Obj_Entry *obj __unused, void (*cleanup)(void)) { - - handle_argv(argc, argv, env); - if (ps_strings != (struct ps_strings *)0) __ps_strings = ps_strings; - if (&_DYNAMIC != NULL) - atexit(cleanup); - else - _init_tls(); #ifdef GCRT - atexit(_mcleanup); - monstartup(&eprol, &etext); + __libc_start1_gcrt(argc, argv, env, cleanup, main, &eprol, &etext); +#else + __libc_start1(argc, argv, env, cleanup, main); #endif - handle_static_init(argc, argv, env); - exit(main(argc, argv, env)); } #ifdef GCRT diff --git a/lib/csu/arm/crt1_s.S b/lib/csu/arm/crt1_s.S index eeeab3588ce2..1f864f217f0b 100644 --- a/lib/csu/arm/crt1_s.S +++ b/lib/csu/arm/crt1_s.S @@ -42,8 +42,6 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD$"); - #include <sys/param.h> #include <sys/elf_common.h> #include "notes.h" diff --git a/lib/csu/arm/crti.S b/lib/csu/arm/crti.S index c6c37eba1b4f..ce2058d3fa65 100644 --- a/lib/csu/arm/crti.S +++ b/lib/csu/arm/crti.S @@ -1,6 +1,4 @@ #include <machine/asm.h> -__FBSDID("$FreeBSD$"); - .section .init,"ax",%progbits .align 4 .globl _init diff --git a/lib/csu/arm/crtn.S b/lib/csu/arm/crtn.S index 25bbd5730ae9..9be6d6cef76c 100644 --- a/lib/csu/arm/crtn.S +++ b/lib/csu/arm/crtn.S @@ -1,6 +1,4 @@ #include <machine/asm.h> -__FBSDID("$FreeBSD$"); - .section .init,"ax",%progbits ldmea fp, {fp, sp, pc} mov pc, lr |