From 00422f5696652c04b919d6984adb2cdc21fd6955 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 27 May 2005 00:23:45 +0000 Subject: With a bit of luck, this might just get mips working again --- libc/sysdeps/linux/mips/Makefile | 20 ++++--- libc/sysdeps/linux/mips/crt0.S | 63 -------------------- libc/sysdeps/linux/mips/crt1.S | 124 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 72 deletions(-) delete mode 100644 libc/sysdeps/linux/mips/crt0.S create mode 100644 libc/sysdeps/linux/mips/crt1.S diff --git a/libc/sysdeps/linux/mips/Makefile b/libc/sysdeps/linux/mips/Makefile index 4f07a70be..6f969de64 100644 --- a/libc/sysdeps/linux/mips/Makefile +++ b/libc/sysdeps/linux/mips/Makefile @@ -19,8 +19,9 @@ TOPDIR=../../../../ include $(TOPDIR)Rules.mak -CRT0_SRC = crt0.S -CRT0_OBJ = crt1.o +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=bsd-_setjmp.S bsd-setjmp.S setjmp.S clone.S syscall.S pipe.S @@ -30,23 +31,25 @@ CSRC=__longjmp.c brk.c setjmp_aux.c mmap.c __syscall_error.c \ cacheflush.c pread_write.c sysmips.c _test_and_set.c #sigaction.c COBJS=$(patsubst %.c,%.o, $(CSRC)) -OBJS=$(SOBJS) $(MOBJ) $(COBJS) +OBJS=$(SOBJS) $(COBJS) OBJ_LIST=../../../obj.sysdeps.$(TARGET_ARCH) all: $(OBJ_LIST) -$(OBJ_LIST): $(OBJS) $(CRT0_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) $(TOPDIR)lib/ - $(LN) -fs $(CRT0_OBJ) $(TOPDIR)/lib/crt0.o - $(LN) -fs $(CRT0_OBJ) $(TOPDIR)/lib/Scrt1.o + 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 +$(SCRT_OBJ): $(CRT_SRC) + $(CC) $(ASFLAGS) $(PIEFLAG) -DL_$* $< -c -o $*.o + $(STRIPTOOL) -x -R .note -R .comment $*.o + $(SOBJS): %.o : %.S $(CC) $(ASFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o @@ -55,7 +58,6 @@ $(COBJS): %.o : %.c $(CC) $(CFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o - ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y) crti.o: crti.S $(CC) $(ASFLAGS) -c crti.S -o crti.o diff --git a/libc/sysdeps/linux/mips/crt0.S b/libc/sysdeps/linux/mips/crt0.S deleted file mode 100644 index 3ce8c9cd8..000000000 --- a/libc/sysdeps/linux/mips/crt0.S +++ /dev/null @@ -1,63 +0,0 @@ -/* 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 -#include - -.text - .global __start - .type __start,%function - .type __uClibc_start_main,%function - .weak _init - .weak _fini - .type __uClibc_start_main,%function -/* 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: -#ifdef __PIC__ - .set noreorder - bltzal zero,0f - nop -0: .cpload $31 - .set reorder -#endif - - move $31, zero /* no return, but since the jal kills $31, skip this */ - lw a0, 0($29) /* argc */ - addu a1, $29, 4 /* get to start of argv */ - addu a2, a0, 1 /* argv[0] program name (ordinal->cardinal) */ - sll a2, a2, 2 /* multiple by 4 */ - add a2, a2, a1 /* a2 now points to start of envp */ - la a3, _init /* a3 is address of _init */ - addiu sp, sp, -24 /* 16 + 4 rounded up to multiple of 8 */ - /* multiple of 8 for longlong/double support */ - la v0, _fini - sw v0, 16(sp) /* stack has 5th argument, address of _fini */ - - /* Ok, now run uClibc's main() -- shouldn't return */ - jal __uClibc_start_main - - addiu sp, sp, 24 /* undo stack argument */ - - /* Crash if somehow `exit' returns anyways. */ -hlt: - b hlt - -/* Define a symbol for the first piece of initialized data. */ - .data - .globl __data_start -__data_start: - .long 0 - .weak data_start - data_start = __data_start - diff --git a/libc/sysdeps/linux/mips/crt1.S b/libc/sysdeps/linux/mips/crt1.S new file mode 100644 index 000000000..b9a206e01 --- /dev/null +++ b/libc/sysdeps/linux/mips/crt1.S @@ -0,0 +1,124 @@ +/* Startup code compliant to the ELF Mips ABI. + Copyright (C) 1995, 1997, 2000, 2001, 2002, 2003, 2004 + 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + In addition to the permissions in the GNU Lesser General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The GNU Lesser General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + Note that people who make modified versions of this file are not + obligated to grant this special exception for their modified + versions; it is their choice whether to do so. The GNU Lesser + General Public License gives permission to release a modified + version without this exception; this exception also makes it + possible to release a modified version which carries forward this + exception. + + 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + + +#include +#include + + + +/* This is the canonical entry point, usually the first thing in the text + segment. The SVR4/Mips ABI (pages 3-31, 3-32) says that when the entry + point runs, most registers' values are unspecified, except for: + + v0 ($2) Contains a function pointer to be registered with `atexit'. + This is how the dynamic linker arranges to have DT_FINI + functions called for shared libraries that have been loaded + before this code runs. + + sp ($29) The stack contains the arguments and environment: + 0(%esp) argc + 4(%esp) argv[0] + ... + (4*argc)(%esp) NULL + (4*(argc+1))(%esp) envp[0] + ... + NULL + ra ($31) The return address register is set to zero so that programs + that search backword through stack frames recognize the last + stack frame. +*/ + + +/* We need to call: + __uClibc_start_main (int (*main) (int, char **, char **), int argc, + char **argv, void (*init) (void), void (*fini) (void), + void (*rtld_fini) (void), void *stack_end) +*/ + +.text + .global _start + .type _start,%function + .type _init,%function + .type _fini,%function + .type main,%function + .type __uClibc_start_main,%function + +__start: +#ifdef __PIC__ + .set noreorder + move $0, $31 /* Save old ra. */ + bal 10f /* Find addr of cpload. */ + nop +10: + .cpload $31; + move $31, $0; + .set reorder +#else + la $28, _gp /* Setup GP correctly if we're non-PIC. */ + move $31, $0 +#endif + + + la $4, main /* main */ + lw $5, 0($29) /* argc */ + addiu $6, $29, 4 /* argv */ + + /* Allocate space on the stack for seven arguments (o32 only) + and make sure the stack is aligned to double words (8 bytes) + on o32 and quad words (16 bytes) on n32 and n64. */ + and $29, -2 * 4 + subu $29, 32 + la $7, _init /* init */ + la $8, _fini + sw $8, 16($29) /* fini */ + sw $2, 20($29) /* rtld_fini */ + sw $29, 24($29) /* stack_end */ + jal __uClibc_start_main +hlt: + /* Crash if somehow `__uClibc_start_main' returns anyway. */ + b hlt + +/* Define a symbol for the first piece of initialized data. */ + .data + .globl __data_start +__data_start: + .long 0 + .weak data_start + data_start = __data_start + + -- cgit v1.2.3