summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-11-05 02:21:28 +0000
committerEric Andersen <andersen@codepoet.org>2003-11-05 02:21:28 +0000
commitf4005423ee520fab1b66d81aff87f00f6fc86204 (patch)
tree1e5dc5cac2311b518e03358b61ee03ff376ff1b3
parentb63b5dcfbf06edb3edd7eecdfff39fcf4dbf0604 (diff)
Continue the conversion to using per-arch crti.S and crtn.S
-rw-r--r--libc/sysdeps/linux/cris/Makefile27
-rw-r--r--libc/sysdeps/linux/cris/crti.S36
-rw-r--r--libc/sysdeps/linux/cris/crtn.S27
3 files changed, 89 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/cris/Makefile b/libc/sysdeps/linux/cris/Makefile
index 39bebf8d5..3bf6d0dcf 100644
--- a/libc/sysdeps/linux/cris/Makefile
+++ b/libc/sysdeps/linux/cris/Makefile
@@ -22,6 +22,7 @@ ASFLAGS=$(CFLAGS)
CRT0_SRC = crt0.c
CRT0_OBJ = crt0.o crt1.o
+CTOR_TARGETS=$(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o
SSRC= setjmp.S __longjmp.S clone.S sysdep.S syscall.S
ifeq ($(UNIFIED_SYSCALL),y)
@@ -39,7 +40,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/
@@ -55,6 +56,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:
diff --git a/libc/sysdeps/linux/cris/crti.S b/libc/sysdeps/linux/cris/crti.S
new file mode 100644
index 000000000..78a1862ef
--- /dev/null
+++ b/libc/sysdeps/linux/cris/crti.S
@@ -0,0 +1,36 @@
+#NO_APP
+ .file "initfini.c"
+#APP
+
+ .section .init
+#NO_APP
+ .align 1
+ .global _init
+ .type _init, @function
+_init:
+ Push $srp
+ subq 4,$sp
+ movem $r0,[$sp]
+ move.d $pc,$r0
+ sub.d .:GOTOFF,$r0
+#APP
+
+ .align 1
+
+
+ .section .fini
+#NO_APP
+ .align 1
+ .global _fini
+ .type _fini, @function
+_fini:
+ Push $srp
+ subq 4,$sp
+ movem $r0,[$sp]
+ move.d $pc,$r0
+ sub.d .:GOTOFF,$r0
+#APP
+ .align 1
+
+
+/*@TRAILER_BEGINS*/
diff --git a/libc/sysdeps/linux/cris/crtn.S b/libc/sysdeps/linux/cris/crtn.S
new file mode 100644
index 000000000..e9d8a963f
--- /dev/null
+++ b/libc/sysdeps/linux/cris/crtn.S
@@ -0,0 +1,27 @@
+#NO_APP
+ .file "initfini.c"
+#APP
+
+ .section .init
+#NO_APP
+ .align 1
+ .global _init
+ .type _init, @function
+#NO_APP
+ movem [$sp+],$r0
+ Jump [$sp+]
+ .size _init, .-_init
+#APP
+
+ .section .fini
+#NO_APP
+ .align 1
+ .global _fini
+ .type _fini, @function
+#NO_APP
+ movem [$sp+],$r0
+ Jump [$sp+]
+ .size _fini, .-_fini
+#APP
+
+/*@TRAILER_BEGINS*/