[uClibc-cvs] uClibc/libc/sysdeps/linux/h8300 Makefile,1.6,1.7 crt0.S,1.5,1.6

[Erik Andersen]

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

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/h8300/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	5 Nov 2002 21:06:51 -0000	1.6
+++ Makefile	23 Jan 2003 17:55:19 -0000	1.7
@@ -1,6 +1,6 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000 by Lineo, inc.
+# 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
@@ -15,19 +15,13 @@
 # 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
 ASFLAGS=$(CFLAGS)
 
-# If you're looking for vfork(), it is defined in include/unistd.h
-
-CRT0=crt0.S
-CRT0_OBJ=$(patsubst %.S,%.o, $(CRT0))
+CRT0_SRC = crt0.S
+CRT0_OBJ = crt0.o crt1.o
 
 SSRC=setjmp.S vfork.S # longjmp.S _start.S clone.S
 SOBJS=$(patsubst %.S,%.o, $(SSRC))
@@ -35,7 +29,7 @@
 CSRC=ptrace.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 
-OBJS=$(SOBJS) $(MOBJ) $(COBJS)
+OBJS=$(SOBJS) $(COBJS)
 
 
 
@@ -45,10 +39,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) $(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/h8300/crt0.S,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- crt0.S	31 Oct 2002 18:19:57 -0000	1.5
+++ crt0.S	23 Jan 2003 17:55:19 -0000	1.6
@@ -22,6 +22,7 @@
 	.global	_start
 	.global __exit
 	.global atexit
+	.global main
 
 	.h8300h
 	.text
@@ -52,12 +53,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
-