[uClibc-cvs] uClibc/libc/sysdeps/linux/m68k Makefile,1.24,1.25 crt0.S,1.11,1.12

[Erik Andersen]

Update of /var/cvs/uClibc/libc/sysdeps/linux/m68k
In directory winder:/tmp/cvs-serv7745/linux/m68k

Modified Files:
	Makefile crt0.S 
Log Message:
Update architecture specific support to consistantly
generate a crt0 and crt1 file.  Most arches still need
to be updated to call __uClibc_start_main() rather than
__uClibc_main().


Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/libc/sysdeps/linux/m68k/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile	5 Nov 2002 21:06:50 -0000	1.24
+++ Makefile	23 Jan 2003 17:55:22 -0000	1.25
@@ -1,7 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001,2002 Erik Andersen <andersen at uclibc.org>
+# Copyright (C) 2000-2003 Erik Andersen <andersen at uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -16,10 +15,6 @@
 # You should have received a copy of the GNU Library General Public License
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# Derived in part from the Linux-8086 C library, the GNU C Library, and several
-# other sundry sources.  Files within this library are copyright by their
-# respective copyright holders.
 
 TOPDIR=../../../../
 include $(TOPDIR)Rules.mak
@@ -29,12 +24,11 @@
 
 
 ifeq ($(UCLIBC_HAS_MMU),y)
-CRT0=crt0.c
-CRT0_OBJ=$(patsubst %.c,%.o, $(CRT0))
+CRT0_SRC = crt0.c
 else
-CRT0=crt0.S
-CRT0_OBJ=$(patsubst %.S,%.o, $(CRT0))
+CRT0_SRC = crt0.S
 endif
+CRT0_OBJ = crt0.o crt1.o
 
 SSRC= __longjmp.S bsd-_setjmp.S bsd-setjmp.S clone.S setjmp.S vfork.S
 SOBJS=$(patsubst %.S,%.o, $(SSRC))
@@ -52,14 +46,10 @@
 
 ar-target: $(OBJS) $(CRT0_OBJ)
 	$(AR) $(ARFLAGS) $(LIBC) $(OBJS)
-	cp $(CRT0_OBJ) $(TOPDIR)lib/$(CRT0_OBJ)
+	cp $(CRT0_OBJ) $(TOPDIR)lib/
 
-ifeq ($(UCLIBC_HAS_MMU),y)
-$(CRT0_OBJ): %.o : %.c
-else
-$(CRT0_OBJ): %.o : %.S
-endif
-	$(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/m68k/crt0.S,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- crt0.S	31 Oct 2002 18:20:01 -0000	1.11
+++ crt0.S	23 Jan 2003 17:55:22 -0000	1.12
@@ -27,6 +27,7 @@
 	.global	_start
 	.global __exit
 	.global atexit
+	.global main
 
 	.text
 
@@ -59,11 +60,4 @@
 #else
 	.set atexit,empty_func
 #endif
-
-
-/* Stick in a dummy reference to main(), so that if an application
- * is linking when the main() function is in a static library (.a)
- * we can be sure that main() actually gets linked in */
-L_dummy_main_reference:
-	.long	main