From 3628edc05e5b439aad08191ab220360f9d9f54bd Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Thu, 12 Dec 2002 10:14:19 +0000
Subject: 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

---
 libc/sysdeps/linux/arm/Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'libc/sysdeps/linux/arm/Makefile')

diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile
index 62facd47d..8cd0efa47 100644
--- a/libc/sysdeps/linux/arm/Makefile
+++ b/libc/sysdeps/linux/arm/Makefile
@@ -25,10 +25,8 @@ TOPDIR=../../../../
 include $(TOPDIR)Rules.mak
 ASFLAGS=$(CFLAGS)
 
-TARGET_MACHINE_TYPE=$(shell $(CC) -dumpmachine)
-
-CRT0=crt0.S
-CRT0_OBJ=crt0.o
+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
 SOBJS=$(patsubst %.S,%.o, $(SSRC))
@@ -45,10 +43,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/
 
-$(CRT0_OBJ): $(CRT0)
-	$(CC) $(CFLAGS) -c $< -o $@
+$(CRT0_OBJ): $(CRT0_SRC)
+	$(CC) $(CFLAGS) -DL_$* $< -c -o $*.o
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(SOBJS): %.o : %.S
-- 
cgit v1.2.3