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/arm | |
| 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/arm')
| -rw-r--r-- | libc/sysdeps/linux/arm/Makefile | 12 | ||||
| -rw-r--r-- | libc/sysdeps/linux/arm/crt0.S | 2 |
2 files changed, 6 insertions, 8 deletions
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 diff --git a/libc/sysdeps/linux/arm/crt0.S b/libc/sysdeps/linux/arm/crt0.S index a930ff3f2..ad0995a6a 100644 --- a/libc/sysdeps/linux/arm/crt0.S +++ b/libc/sysdeps/linux/arm/crt0.S @@ -80,7 +80,7 @@ _start: ldr r2,[sp, #8] #endif -#ifdef __UCLIBC_CTOR_DTOR__ +#if defined L_crt1 && defined __UCLIBC_CTOR_DTOR__ /* Store the address of _init in r3 as an argument to main() */ ldr r3, =_init |