diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-01-23 17:55:27 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-01-23 17:55:27 +0000 |
| commit | a3560dc47b3cf2eef3ebf0e0c9765e11bdf66b6a (patch) | |
| tree | b6a67f0d5748f0f69cb2b0a971e6f2c74da3065f /libc/sysdeps/linux/m68k | |
| parent | 100cc918a944bd0d40ecb2afc635f2b76d7cb577 (diff) | |
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().
Diffstat (limited to 'libc/sysdeps/linux/m68k')
| -rw-r--r-- | libc/sysdeps/linux/m68k/Makefile | 24 | ||||
| -rw-r--r-- | libc/sysdeps/linux/m68k/crt0.S | 8 |
2 files changed, 8 insertions, 24 deletions
diff --git a/libc/sysdeps/linux/m68k/Makefile b/libc/sysdeps/linux/m68k/Makefile index 78f1c3f19..36970c6df 100644 --- a/libc/sysdeps/linux/m68k/Makefile +++ b/libc/sysdeps/linux/m68k/Makefile @@ -1,7 +1,6 @@ # Makefile for uClibc # -# Copyright (C) 2000 by Lineo, inc. -# Copyright (C) 2000,2001,2002 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2003 Erik Andersen <andersen@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 @@ ASFLAGS=$(CFLAGS) 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 @@ $(LIBC): ar-target 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 diff --git a/libc/sysdeps/linux/m68k/crt0.S b/libc/sysdeps/linux/m68k/crt0.S index 8d7f6802d..36546835c 100644 --- a/libc/sysdeps/linux/m68k/crt0.S +++ b/libc/sysdeps/linux/m68k/crt0.S @@ -27,6 +27,7 @@ Cambridge, MA 02139, USA. */ .global _start .global __exit .global atexit + .global main .text @@ -60,10 +61,3 @@ empty_func: .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 - |