diff options
| author | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2005-05-21 21:19:43 +0000 |
|---|---|---|
| committer | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2005-05-21 21:19:43 +0000 |
| commit | e3006e038e293a5d52627c9200316acee37ec5fb (patch) | |
| tree | ec0d2a6217ab4d90504bf764e5f1074fc87089f8 /libc/sysdeps/linux/i386/Makefile | |
| parent | bd22e54f65f260f5ea9591a1a60d1686e7dfd052 (diff) | |
| download | uClibc-alpine-e3006e038e293a5d52627c9200316acee37ec5fb.tar.bz2 uClibc-alpine-e3006e038e293a5d52627c9200316acee37ec5fb.tar.xz | |
Pass main function ptr from crt1 to __uClibc_start_main.
Kill old crt0/__uClibc_main.
This breaks ABI. All apps and toolchain needs to be recompiled.
All archs except x86 are now broken and need to be fixed as x86.
PPC will be fixed shortly by me, the rest is left to the arch maintainers.
Diffstat (limited to 'libc/sysdeps/linux/i386/Makefile')
| -rw-r--r-- | libc/sysdeps/linux/i386/Makefile | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile index d9bf0239a..e29707f0e 100644 --- a/libc/sysdeps/linux/i386/Makefile +++ b/libc/sysdeps/linux/i386/Makefile @@ -19,10 +19,9 @@ TOPDIR=../../../../ include $(TOPDIR)Rules.mak -CRT0_SRC = crt0.S -CRT0_OBJ = crt0.o crt1.o -SCRT0_OBJ = $(patsubst %,S%, $(CRT0_OBJ)) -CRT0_DEPS=gmon-start.S +CRT_SRC = crt1.S +CRT_OBJ = crt1.o +SCRT_OBJ = $(patsubst %,S%, $(CRT_OBJ)) CTOR_TARGETS=$(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o SSRC=__longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \ @@ -38,21 +37,16 @@ OBJ_LIST=../../../obj.sysdeps.$(TARGET_ARCH) all: $(OBJ_LIST) -$(OBJ_LIST): $(OBJS) $(CRT0_OBJ) $(SCRT0_OBJ) $(CTOR_TARGETS) +$(OBJ_LIST): $(OBJS) $(CRT_OBJ) $(SCRT_OBJ) $(CTOR_TARGETS) echo $(patsubst %, sysdeps/linux/$(TARGET_ARCH)/%, $(OBJS)) > $(OBJ_LIST) $(INSTALL) -d $(TOPDIR)lib/ - cp $(CRT0_OBJ) $(SCRT0_OBJ) $(TOPDIR)lib/ -ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) - $(RM) $(TOPDIR)lib/Scrt0.o -else - mv $(TOPDIR)lib/Scrt0.o $(TOPDIR)lib/Scrt1.o -endif + cp $(CRT_OBJ) $(SCRT_OBJ) $(TOPDIR)lib/ -$(CRT0_OBJ): $(CRT0_SRC) +$(CRT_OBJ): $(CRT_SRC) $(CC) $(ASFLAGS) -DL_$* $< -c -o $*.o $(STRIPTOOL) -x -R .note -R .comment $*.o -$(SCRT0_OBJ): $(CRT0_SRC) +$(SCRT_OBJ): $(CRT_SRC) $(CC) $(ASFLAGS) $(PIEFLAG) -DL_$* $< -c -o $*.o $(STRIPTOOL) -x -R .note -R .comment $*.o @@ -94,4 +88,3 @@ clean: $(RM) *.[oa] *~ core $(RM) bits/sysnum.h $(RM) $(TOPDIR)/include/fpu_control.h - $(RM) gmon-start.S |