diff options
Diffstat (limited to 'sysdeps/mach')
| -rw-r--r-- | sysdeps/mach/hurd/i386/Makefile | 7 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/init-first.c | 21 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/static-start.S | 28 |
3 files changed, 51 insertions, 5 deletions
diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile new file mode 100644 index 0000000000..49f609c510 --- /dev/null +++ b/sysdeps/mach/hurd/i386/Makefile @@ -0,0 +1,7 @@ +ifeq ($(subdir),csu) +extra-objs += crt0.o +install-lib += crt0.o + +$(objpfx)crt0.o: $(objpfx)static-start.o $(objpfx)abi-note.o $(objpfx)init.o + $(link-relocatable) +endif diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c index 10094f0967..07718d3dad 100644 --- a/sysdeps/mach/hurd/i386/init-first.c +++ b/sysdeps/mach/hurd/i386/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. For i386/Hurd. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 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 @@ -21,11 +21,13 @@ #include <stdio.h> #include <unistd.h> #include <string.h> +#include <sysdep.h> +#include <set-hooks.h> #include "hurdstartup.h" -#include "set-hooks.h" #include "hurdmalloc.h" /* XXX */ extern void __mach_init (void); +extern void __libc_init_secure (void); extern void __libc_init (int, char **, char **); extern void __getopt_clean_environment (char **); extern void __libc_global_ctors (void); @@ -40,7 +42,7 @@ extern int __libc_argc; extern char **__libc_argv; /* We often need the PID. Cache this value. */ -pid_t __libc_pid; +pid_t __libc_pid = 0xf00baa; void *(*_cthread_init_routine) (void); /* Returns new SP to use. */ void (*_cthread_exit_routine) (int status) __attribute__ ((__noreturn__)); @@ -59,6 +61,7 @@ init1 (int argc, char *arg0, ...) __libc_argc = argc; __libc_argv = argv; __environ = envp; + while (*envp) ++envp; d = (void *) ++envp; @@ -106,6 +109,10 @@ init1 (int argc, char *arg0, ...) d->portarray, d->portarraysize, d->intarray, d->intarraysize); +#ifndef PIC + __libc_init_secure (); +#endif + __libc_init (argc, argv, __environ); /* This is a hack to make the special getopt in GNU libc working. */ @@ -214,8 +221,6 @@ init (int *data) pointer in the dynamic section based solely on that. It is convention for this function to be in the `.init' section, but the symbol name is the only thing that really matters!! */ -/*void _init (int argc, ...) __attribute__ ((unused, section (".init")));*/ - void _init (int argc, ...) { @@ -232,6 +237,12 @@ _init (int argc, ...) void __libc_init_first (int argc __attribute__ ((unused)), ...) { +} + + +void +_hurd_stack_setup (int argc __attribute__ ((unused)), ...) +{ #ifndef PIC void doinit (int *data) { diff --git a/sysdeps/mach/hurd/i386/static-start.S b/sysdeps/mach/hurd/i386/static-start.S new file mode 100644 index 0000000000..9105a65ea8 --- /dev/null +++ b/sysdeps/mach/hurd/i386/static-start.S @@ -0,0 +1,28 @@ +/* Startup code for statically linked Hurd/i386 binaries. + Copyright (C) 1998 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + + .text + .globl _start +_start: + call _hurd_stack_setup + xorl %edx, %edx + jmp _start1 + +#define _start _start1 +#include <sysdeps/i386/elf/start.S> |