From a1ec4fae6d9b3280f661bb80127d90c0d53a7a99 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Wed, 5 Nov 2003 00:43:09 +0000 Subject: Continue the conversion to using per-arch crti.S and crtn.S --- libc/sysdeps/linux/arm/Makefile | 27 ++++++++++++++++++++++++++- libc/sysdeps/linux/arm/crti.S | 26 ++++++++++++++++++++++++++ libc/sysdeps/linux/arm/crtn.S | 17 +++++++++++++++++ libc/sysdeps/linux/powerpc/Makefile | 28 +++++++++++++++++++++++++++- libc/sysdeps/linux/powerpc/crti.S | 31 +++++++++++++++++++++++++++++++ libc/sysdeps/linux/powerpc/crtn.S | 30 ++++++++++++++++++++++++++++++ 6 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 libc/sysdeps/linux/arm/crti.S create mode 100644 libc/sysdeps/linux/arm/crtn.S create mode 100644 libc/sysdeps/linux/powerpc/crti.S create mode 100644 libc/sysdeps/linux/powerpc/crtn.S diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile index 95302c487..93b19013e 100644 --- a/libc/sysdeps/linux/arm/Makefile +++ b/libc/sysdeps/linux/arm/Makefile @@ -23,6 +23,7 @@ ASFLAGS=$(CFLAGS) CRT0_SRC = crt0.S CRT0_OBJ = crt0.o crt1.o gcrt1.o CRT0_DEPS=gmon-start.S +CTOR_TARGETS=$(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o SSRC=__longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \ bsd-_setjmp.S sigrestorer.S mmap64.S @@ -38,7 +39,7 @@ all: $(OBJS) $(LIBC) $(LIBC): ar-target -ar-target: $(OBJS) $(CRT0_OBJ) +ar-target: $(OBJS) $(CRT0_OBJ) $(CTOR_TARGETS) $(AR) $(ARFLAGS) $(LIBC) $(OBJS) cp $(CRT0_OBJ) $(TOPDIR)lib/ @@ -64,6 +65,30 @@ gmon-start.S: ../common/gmon-start.c gcrt1.o: $(CRT0_DEPS) endif +ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) +crti.o: crti.S + $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + +$(TOPDIR)lib/crti.o: crti.o + $(INSTALL) -d $(TOPDIR)lib/ + cp crti.o $(TOPDIR)lib/ + +crtn.o: crtn.S + $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + +$(TOPDIR)lib/crtn.o: crtn.o + $(INSTALL) -d $(TOPDIR)lib/ + cp crtn.o $(TOPDIR)lib/ +else +$(TOPDIR)lib/crti.o: + $(INSTALL) -d $(TOPDIR)lib/ + $(AR) $(ARFLAGS) $(TOPDIR)lib/crti.o +$(TOPDIR)lib/crtn.o: + $(INSTALL) -d $(TOPDIR)lib/ + $(AR) $(ARFLAGS) $(TOPDIR)lib/crtn.o +endif + + headers: $(LN) -fs ../libc/sysdeps/linux/arm/fpu_control.h $(TOPDIR)/include/ diff --git a/libc/sysdeps/linux/arm/crti.S b/libc/sysdeps/linux/arm/crti.S new file mode 100644 index 000000000..0cacb1f10 --- /dev/null +++ b/libc/sysdeps/linux/arm/crti.S @@ -0,0 +1,26 @@ + .file "initfini.c" + + .section .init + .align 2 + .global _init + .type _init, %function +_init: + @ args = 0, pretend = 0, frame = 0 + @ frame_needed = 0, uses_anonymous_args = 0 + str lr, [sp, #-4]! + + .align 2 + + + .section .fini + .align 2 + .global _fini + .type _fini, %function +_fini: + @ args = 0, pretend = 0, frame = 0 + @ frame_needed = 0, uses_anonymous_args = 0 + str lr, [sp, #-4]! + .align 2 + + + .ident "GCC: (GNU) 3.3.2 20031005 (Debian prerelease)" diff --git a/libc/sysdeps/linux/arm/crtn.S b/libc/sysdeps/linux/arm/crtn.S new file mode 100644 index 000000000..851898de0 --- /dev/null +++ b/libc/sysdeps/linux/arm/crtn.S @@ -0,0 +1,17 @@ + .file "initfini.c" + + .section .init + .align 2 + .global _init + .type _init, %function + ldr pc, [sp], #4 + .size _init, .-_init + + .section .fini + .align 2 + .global _fini + .type _fini, %function + ldr pc, [sp], #4 + .size _fini, .-_fini + + .ident "GCC: (GNU) 3.3.2 20031005 (Debian prerelease)" diff --git a/libc/sysdeps/linux/powerpc/Makefile b/libc/sysdeps/linux/powerpc/Makefile index 862444781..f9fdcd123 100644 --- a/libc/sysdeps/linux/powerpc/Makefile +++ b/libc/sysdeps/linux/powerpc/Makefile @@ -23,6 +23,7 @@ ASFLAGS=$(CFLAGS) CRT0_SRC = crt0.S CRT0_OBJ = crt0.o crt1.o gcrt1.o CRT0_DEPS=gmon-start.S +CTOR_TARGETS=$(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o SSRC=__longjmp.S setjmp.S bsd-setjmp.S bsd-_setjmp.S brk.S \ clone.S __uClibc_syscall.S syscall.S @@ -41,7 +42,7 @@ all: $(OBJS) $(LIBC) $(LIBC): ar-target -ar-target: $(OBJS) $(CRT0_OBJ) +ar-target: $(OBJS) $(CRT0_OBJ) $(CTOR_TARGETS) $(AR) $(ARFLAGS) $(LIBC) $(OBJS) cp $(CRT0_OBJ) $(TOPDIR)lib/ @@ -67,6 +68,31 @@ gmon-start.S: ../common/gmon-start.c gcrt1.o: $(CRT0_DEPS) endif + +ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) +crti.o: crti.S + $(CC) $(SAFECFLAGS) -c crti.S -o crti.o + +$(TOPDIR)lib/crti.o: crti.o + $(INSTALL) -d $(TOPDIR)lib/ + cp crti.o $(TOPDIR)lib/ + +crtn.o: crtn.S + $(CC) $(SAFECFLAGS) -c crtn.S -o crtn.o + +$(TOPDIR)lib/crtn.o: crtn.o + $(INSTALL) -d $(TOPDIR)lib/ + cp crtn.o $(TOPDIR)lib/ +else +$(TOPDIR)lib/crti.o: + $(INSTALL) -d $(TOPDIR)lib/ + $(AR) $(ARFLAGS) $(TOPDIR)lib/crti.o +$(TOPDIR)lib/crtn.o: + $(INSTALL) -d $(TOPDIR)lib/ + $(AR) $(ARFLAGS) $(TOPDIR)lib/crtn.o +endif + + headers: $(LN) -fs ../libc/sysdeps/linux/powerpc/fpu_control.h $(TOPDIR)/include/ diff --git a/libc/sysdeps/linux/powerpc/crti.S b/libc/sysdeps/linux/powerpc/crti.S new file mode 100644 index 000000000..491642496 --- /dev/null +++ b/libc/sysdeps/linux/powerpc/crti.S @@ -0,0 +1,31 @@ + .file "initfini.c" +#APP + + .section .init +#NO_APP + .align 2 + .globl _init + .type _init, @function +_init: + stwu 1,-32(1) + mflr 0 + stw 0,36(1) +#APP + + .align 2 + + + .section .fini +#NO_APP + .align 2 + .globl _fini + .type _fini, @function +_fini: + stwu 1,-32(1) + mflr 0 + stw 0,36(1) +#APP + .align 2 + + + .ident "GCC: (GNU) 3.3.1 20030626 (Debian prerelease)" diff --git a/libc/sysdeps/linux/powerpc/crtn.S b/libc/sysdeps/linux/powerpc/crtn.S new file mode 100644 index 000000000..5de93ea8a --- /dev/null +++ b/libc/sysdeps/linux/powerpc/crtn.S @@ -0,0 +1,30 @@ + .file "initfini.c" +#APP + + .section .init +#NO_APP + .align 2 + .globl _init + .type _init, @function +#NO_APP + lwz 0,36(1) + addi 1,1,32 + mtlr 0 + blr + .size _init, .-_init +#APP + + .section .fini +#NO_APP + .align 2 + .globl _fini + .type _fini, @function +#NO_APP + lwz 0,36(1) + addi 1,1,32 + mtlr 0 + blr + .size _fini, .-_fini +#APP + + .ident "GCC: (GNU) 3.3.1 20030626 (Debian prerelease)" -- cgit v1.2.3