Begin the conversion to using per-arch crti.S and crtn.S

3 files changed, 100 insertions, 1 deletions

diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile
index 1bf634170..02918f8ae 100644
--- a/libc/sysdeps/linux/i386/Makefile
+++ b/libc/sysdeps/linux/i386/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 syscall.S mmap64.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/i386/fpu_control.h $(TOPDIR)/include/
 
diff --git a/libc/sysdeps/linux/i386/crti.S b/libc/sysdeps/linux/i386/crti.S
new file mode 100644
index 000000000..3cc97f833
--- /dev/null
+++ b/libc/sysdeps/linux/i386/crti.S
@@ -0,0 +1,40 @@
+	.file	"initfini.c"
+#APP
+	
+	.section .init
+#NO_APP
+.globl _init
+	.type	_init, @function
+_init:
+	pushl	%ebp
+	movl	%esp, %ebp
+	pushl	%ebx
+	call	__i686.get_pc_thunk.bx
+	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
+#APP
+	
+	
+	
+	
+	.section .fini
+#NO_APP
+.globl _fini
+	.type	_fini, @function
+_fini:
+	pushl	%ebp
+	movl	%esp, %ebp
+	pushl	%ebx
+	call	__i686.get_pc_thunk.bx
+	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
+#APP
+	
+	
+	
+	.section	.gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
+.globl __i686.get_pc_thunk.bx
+	.hidden	__i686.get_pc_thunk.bx
+	.type	__i686.get_pc_thunk.bx, @function
+__i686.get_pc_thunk.bx:
+	movl	(%esp), %ebx
+	ret
+	.ident	"GCC: (GNU) 3.3.2 (Debian)"
diff --git a/libc/sysdeps/linux/i386/crtn.S b/libc/sysdeps/linux/i386/crtn.S
new file mode 100644
index 000000000..733f25b83
--- /dev/null
+++ b/libc/sysdeps/linux/i386/crtn.S
@@ -0,0 +1,33 @@
+	.file	"initfini.c"
+#APP
+	
+	.section .init
+#NO_APP
+.globl _init
+	.type	_init, @function
+#NO_APP
+	popl	%ebx
+	popl	%ebp
+	ret
+	.size	_init, .-_init
+#APP
+	
+	.section .fini
+#NO_APP
+.globl _fini
+	.type	_fini, @function
+#NO_APP
+	popl	%ebx
+	popl	%ebp
+	ret
+	.size	_fini, .-_fini
+#APP
+	
+	.section	.gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
+.globl __i686.get_pc_thunk.bx
+	.hidden	__i686.get_pc_thunk.bx
+	.type	__i686.get_pc_thunk.bx, @function
+__i686.get_pc_thunk.bx:
+	movl	(%esp), %ebx
+	ret
+	.ident	"GCC: (GNU) 3.3.2 (Debian)"