[uClibc-cvs] uClibc/libc/sysdeps/linux/sh Makefile,1.18,1.19 crt0.S,1.10,1.11

Erik Andersen andersen at codepoet.org
Thu Dec 12 10:14:23 UTC 2002


Update of /var/cvs/uClibc/libc/sysdeps/linux/sh
In directory winder:/tmp/cvs-serv5260/libc/sysdeps/linux/sh

Modified Files:
	Makefile crt0.S 
Log Message:
Based on discussions with Stefan Allius, change it so that we always
build a crt0.o and a crt1.o.  crt1.o will support ctors and dtors if
such support is enabled.  One more gratuitous toolchain support issue
is thereby removed...
 -Erik


Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/libc/sysdeps/linux/sh/Makefile,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile	15 Nov 2002 09:21:07 -0000	1.18
+++ Makefile	12 Dec 2002 10:14:19 -0000	1.19
@@ -25,12 +25,10 @@
 include $(TOPDIR)Rules.mak
 
 CFLAGS+= -I../
-SFLAGS= $(CFLAGS) -D__ASSEMBLER__ -DASM_GLOBAL_DIRECTIVE=.globl
-
-TARGET_MACHINE_TYPE=$(shell $(CC) -dumpmachine)
+SFLAGS= $(CFLAGS) -D__ASSEMBLER__
 
-CRT0=crt0.S
-CRT0_OBJ=$(patsubst %.S,%.o, $(CRT0))
+CRT0_SRC = crt0.S
+CRT0_OBJ = crt0.o crt1.o
 
 SSRC=setjmp.S __longjmp.S vfork.S clone.S
 SOBJS=$(patsubst %.S,%.o, $(SSRC))
@@ -47,10 +45,10 @@
 
 ar-target: $(OBJS) $(CRT0_OBJ)
 	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
-	cp $(CRT0_OBJ) $(TOPDIR)lib/$(CRT0_OBJ)
+	cp $(CRT0_OBJ) $(TOPDIR)lib/
 
-$(CRT0_OBJ): %.o : %.S
-	$(CC) $(SFLAGS) -c $< -o $@
+$(CRT0_OBJ): $(CRT0_SRC)
+	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(SOBJS): %.o : %.S

Index: crt0.S
===================================================================
RCS file: /var/cvs/uClibc/libc/sysdeps/linux/sh/crt0.S,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- crt0.S	29 Nov 2002 12:40:10 -0000	1.10
+++ crt0.S	12 Dec 2002 10:14:19 -0000	1.11
@@ -49,7 +49,7 @@
 	mov.l @r15+,r4
 	mov r15, r5
 
-#if ! defined __UCLIBC_CTOR_DTOR__
+#if defined L_crt0 || ! defined __UCLIBC_CTOR_DTOR__
 	/*
 	 * Setup the value for the environment pointer:
 	 * r6 = (argc + 1) * 4
@@ -58,12 +58,11 @@
 	mov r4,r6
 	add #1,r6
 	shll2 r6
-	add r5, r6
 
 	/* jump to __uClibc_main (argc, argv, envp) */
 	mov.l L_main, r0
 	jsr @r0
-	nop /* delay slot */
+	add r5, r6 /* delay slot */
 
 	/* We should not get here. */
 	mov.l L_abort, r0
@@ -76,7 +75,7 @@
 L_main:
 	.long   __uClibc_main /* in libuClibc.*.so */
 
-#else /* __UCLIBC_CTOR_DTOR__ */
+#else /* L_crt1 && __UCLIBC_CTOR_DTOR__ */
 	/* Push the finip argument to __uClibc_start_main() onto the stack */
 	mov.l L_fini,r6
 	mov.l r6, at -r15




More information about the uClibc-cvs mailing list