[uClibc-cvs] uClibc/libc/sysdeps/linux/mips Makefile,1.24,1.25 crt0.S,1.7,1.8

[Erik Andersen]

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

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/mips/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile	5 Sep 2002 05:29:29 -0000	1.24
+++ Makefile	12 Dec 2002 10:14:18 -0000	1.25
@@ -25,10 +25,8 @@
 include $(TOPDIR)Rules.mak
 ASFLAGS=$(CFLAGS)
 
-TARGET_MACHINE_TYPE=$(shell $(CC) -dumpmachine)
-
-CRT0=crt0.S
-CRT0_OBJ=$(patsubst %.S,%.o, $(CRT0))
+CRT0_SRC = crt0.S
+CRT0_OBJ = crt0.o crt1.o
 
 SSRC=bsd-_setjmp.S bsd-setjmp.S setjmp.S clone.S fork.S syscall.S
 SOBJS=$(patsubst %.S,%.o, $(SSRC))
@@ -47,9 +45,8 @@
 	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
 	cp $(CRT0_OBJ) $(TOPDIR)lib/
 
-
-$(CRT0_OBJ): %.o : %.S
-	$(CC) $(CFLAGS) -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/mips/crt0.S,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- crt0.S	27 Nov 2002 23:33:56 -0000	1.7
+++ crt0.S	12 Dec 2002 10:14:18 -0000	1.8
@@ -30,7 +30,7 @@
 	addu a2, a0, 1	    /* argv[0] program name (ordinal->cardinal) */
         sll  a2, a2, 2	    /* multiple by 4 */
 	add  a2, a2, a1	    /* a2 now points to start of envp */
-#ifdef __UCLIBC_CTOR_DTOR__
+#if defined L_crt1 && defined __UCLIBC_CTOR_DTOR__
 	la   a3, _init	    /* a3 is address of _init */
 	addiu sp, sp, -24   /* 16 + 4 rounded up to multiple of 8 */
 			    /* multiple of 8 for longlong/double support */