diff -Nru uClibc-0.9.23/libc/misc/internals/Makefile uClibc-0.9.23-etdyn/libc/misc/internals/Makefile --- uClibc-0.9.23/libc/misc/internals/Makefile 2003-10-18 06:18:58.000000000 -0400 +++ uClibc-0.9.23-etdyn/libc/misc/internals/Makefile 2003-11-21 00:51:26.000000000 -0500 @@ -47,6 +47,7 @@ interp.o: interp.c $(CC) $(CFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o + $(INSTALL) $@ $(TOPDIR)lib/ $(COBJS): %.o : %.c $(CC) $(CFLAGS) -c $< -o $@ diff -Nru uClibc-0.9.23/libc/sysdeps/linux/i386/Makefile uClibc-0.9.23-etdyn/libc/sysdeps/linux/i386/Makefile --- uClibc-0.9.23/libc/sysdeps/linux/i386/Makefile 2003-11-08 16:21:19.000000000 -0500 +++ uClibc-0.9.23-etdyn/libc/sysdeps/linux/i386/Makefile 2003-11-21 00:51:26.000000000 -0500 @@ -25,6 +25,9 @@ CRT0_DEPS=gmon-start.S CTOR_TARGETS=$(TOPDIR)lib/crti.o $(TOPDIR)lib/crtn.o +CRT0S_SRC = crt0S.S +CRT0S_OBJ = crt0S.o crt1S.o + SSRC=__longjmp.S vfork.S clone.S setjmp.S bsd-setjmp.S \ bsd-_setjmp.S syscall.S mmap64.S ifeq ($(strip $(UCLIBC_PROFILING)),y) @@ -49,14 +52,23 @@ $(LIBC): ar-target -ar-target: $(OBJS) $(CRT0_OBJ) $(CTOR_TARGETS) +ar-target: $(OBJS) $(CRT0_OBJ) $(CTOR_TARGETS) $(CRT0S_OBJ) $(AR) $(ARFLAGS) $(LIBC) $(OBJS) cp $(CRT0_OBJ) $(TOPDIR)lib/ +ifneq ($(strip $(UCLIBC_CTOR_DTOR)),y) + cp crt0S.o $(TOPDIR)lib/crt1S.o +else + cp crt1S.o $(TOPDIR)lib/ +endif $(CRT0_OBJ): $(CRT0_SRC) $(CC) $(CFLAGS) -DL_$* $< -c -o $*.o $(STRIPTOOL) -x -R .note -R .comment $*.o +$(CRT0S_OBJ): $(CRT0S_SRC) + $(CC) $(CFLAGS) -fPIC -DL_$* $< -c -o $*.o + $(STRIPTOOL) -x -R .note -R .comment $*.o + $(SOBJS): %.o : %.S $(CC) $(CFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o diff -Nru uClibc-0.9.23/libc/sysdeps/linux/i386/crt0S.S uClibc-0.9.23-etdyn/libc/sysdeps/linux/i386/crt0S.S --- uClibc-0.9.23/libc/sysdeps/linux/i386/crt0S.S 1969-12-31 19:00:00.000000000 -0500 +++ uClibc-0.9.23-etdyn/libc/sysdeps/linux/i386/crt0S.S 2003-11-21 00:53:58.000000000 -0500 @@ -0,0 +1,113 @@ +/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. +This file is part of the GNU C Library. + +The GNU C Library 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 Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + + +/* Based on the code from GNU libc, but hacked up by John Beppu and Erik Andersen */ +/* crt0S.S adapted by the Pax Team, solar@gentoo,org, Peter S. Mazinger + * for ET_DYN executable shared objects binaries + */ + +/* + When we enter this piece of code, the program stack looks like this: + argc argument counter (integer) + argv[0] program name (pointer) + argv[1...N] program args (pointers) + argv[argc-1] end of args (integer) + NULL + env[0...N] environment variables (pointers) + NULL +*/ + +#include + +.text + .align 4 + + .global _start + .type _start,%function +#if defined L_crt0S || ! defined __UCLIBC_CTOR_DTOR__ + .type __uClibc_main,%function +#else + .weak _init + .weak _fini + .type __uClibc_start_main,%function +#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 */ + .type main,%function + +_start: + /* locate the start of the environment variables */ + popl %ecx /* Store argc into %ecx */ + movl %esp,%ebx /* Store argv into ebx */ + movl %esp,%eax /* Store argv into eax as well*/ + movl %ecx,%edx /* Stick argc into %edx so we can do some math in a sec */ + leal 4(%eax,%edx,4),%eax + + /* [ register layout ] + + sizeof(char*) == 4 + %ecx = argc ; 0(esp) + %ebx = argv ; 4(esp) + %eax = env ; argv + (argc * 4) + 4 + */ + + /* Set up an invalid (NULL return address, NULL frame pointer) + callers stack frame so anybody unrolling the stack knows where + to stop */ + xorl %ebp,%ebp /* NULL */ + pushl %ebp /* callers %cs */ + pushl %ebp /* callers %eip (return address) */ + pushl %ebp /* callers %ebp (frame pointer) */ + movl %esp,%ebp /* mark callers stack frame as invalid */ + + call .L0 +.L0: + pop %edx + addl $_GLOBAL_OFFSET_TABLE_+[.-.L0],%edx + +#if (defined L_crt1S || defined L_gcrt1 ) && defined __UCLIBC_CTOR_DTOR__ + /* Push .init and .fini arguments to __uClibc_start_main() on the stack */ + pushl _fini@GOT(%edx) + pushl _init@GOT(%edx) + + /* Push envp, argc, and argc arguments to __uClibc_start_main() on the stack */ + pushl %eax /* Environment pointer */ + pushl %ebx /* Argument pointer */ + pushl %ecx /* And the argument count */ + + /* Ok, now run uClibc's main() -- shouldn't return */ + call *__uClibc_start_main@GOT(%edx) +#else + /* Push envp, argc, and argc arguments to __uClibc_main() on the stack */ + pushl %eax /* Environment pointer */ + pushl %ebx /* Argument pointer */ + pushl %ecx /* And the argument count */ + + call *__uClibc_main@GOT(%edx) +#endif + + /* Crash if somehow `exit' returns anyways. */ + hlt +.size _start,.-_start + +/* We disable profiling in crt0S.S, because it introduces text relocations. */ +#if 0 && defined L_gcrt1 && defined __UCLIBC_PROFILING__ +# include "./gmon-start.S" +#endif