Jelajahi Sumber

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

Eric Andersen 20 tahun lalu
induk
melakukan
5cae04a3a2

+ 26 - 1
libc/sysdeps/linux/v850/Makefile

@@ -27,6 +27,7 @@ TARGET_MACHINE_TYPE=$(shell $(CC) -dumpmachine)
 
 CRT0_SRC = crt0.S
 CRT0_OBJ = crt0.o crt1.o
+CTOR_TARGETS=$(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o
 
 SSRC = setjmp.S __longjmp.S vfork.S
 SOBJS = $(patsubst %.S,%.o, $(SSRC))
@@ -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/
 
@@ -57,6 +58,30 @@ $(COBJS): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
+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:
 
 clean:

+ 27 - 0
libc/sysdeps/linux/v850/crti.S

@@ -0,0 +1,27 @@
+	.file	"initfini.c"
+#APP
+	
+	.section .init
+#NO_APP
+	.align 1
+	.global __init
+	.type	__init, @function
+__init:
+	jarl __save_r31, r10
+#APP
+	
+	.align 1
+	
+	
+	.section .fini
+#NO_APP
+	.align 1
+	.global __fini
+	.type	__fini, @function
+__fini:
+	jarl __save_r31, r10
+#APP
+	.align 1
+	
+	
+	.ident	"GCC: (GNU) 3.3.2"

+ 24 - 0
libc/sysdeps/linux/v850/crtn.S

@@ -0,0 +1,24 @@
+	.file	"initfini.c"
+#APP
+	
+	.section .init
+#NO_APP
+	.align 1
+	.global __init
+	.type	__init, @function
+#NO_APP
+	jr __return_r31
+	.size	__init, .-__init
+#APP
+	
+	.section .fini
+#NO_APP
+	.align 1
+	.global __fini
+	.type	__fini, @function
+#NO_APP
+	jr __return_r31
+	.size	__fini, .-__fini
+#APP
+	
+	.ident	"GCC: (GNU) 3.3.2"