diff options
author | Eric Andersen <andersen@codepoet.org> | 2002-12-12 10:14:19 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2002-12-12 10:14:19 +0000 |
commit | 3628edc05e5b439aad08191ab220360f9d9f54bd (patch) | |
tree | ff8aaa7216e50019a7852d367bae3bae34fdb92d /libc/sysdeps/linux/i386/Makefile | |
parent | f329b6fe2f16e16000bb648aa678c2a947258e87 (diff) |
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
Diffstat (limited to 'libc/sysdeps/linux/i386/Makefile')
-rw-r--r-- | libc/sysdeps/linux/i386/Makefile | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile index aa7b2cd28..77c8c815d 100644 --- a/libc/sysdeps/linux/i386/Makefile +++ b/libc/sysdeps/linux/i386/Makefile @@ -21,20 +21,12 @@ # other sundry sources. Files within this library are copyright by their # respective copyright holders. -USE_CRT0_C=false - TOPDIR=../../../../ include $(TOPDIR)Rules.mak ASFLAGS=$(CFLAGS) -ifeq ($(USE_CRT0_C),true) -CRT0=crt0.c -CRT0_OBJ=$(patsubst %.c,%.o, $(CRT0)) -else -CRT0=crt0.S -CRT0_OBJ=$(patsubst %.S,%.o, $(CRT0)) -endif - +CRT0_SRC = crt0.S +CRT0_OBJ = crt0.o crt1.o SSRC=__longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \ bsd-_setjmp.S syscall.S @@ -52,14 +44,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 ($(USE_CRT0_C),true) -$(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 |