diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/i386/init-first.c | 2 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/static-start.S | 4 | ||||
| -rw-r--r-- | sysdeps/mach/start.c | 103 | ||||
| -rw-r--r-- | sysdeps/sh/init-first.c | 2 |
5 files changed, 9 insertions, 107 deletions
diff --git a/ChangeLog b/ChangeLog index 06c33afa2c..71853d8e50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2012-06-23 Thomas Schwinge <thomas@codesourcery.com> + * sysdeps/mach/start.c: Remove file. + * sysdeps/mach/hurd/i386/static-start.S: Fix start.S include. + * sysdeps/i386/init-first.c: Fix comment regarding start.S. + * sysdeps/sh/init-first.c: Likewise. + * sysdeps/sh/____longjmp_chk.S (CALL_FAIL): Preserve r12 and pr registers for frame unwinding purposes, add CFI directives. * sysdeps/unix/sysv/linux/sh/____longjmp_chk.S (CALL_FAIL): Likewise. diff --git a/sysdeps/i386/init-first.c b/sysdeps/i386/init-first.c index c2eaccd017..edea7f2697 100644 --- a/sysdeps/i386/init-first.c +++ b/sysdeps/i386/init-first.c @@ -48,7 +48,7 @@ init (int *data) #ifdef SHARED /* This function is called to initialize the shared C library. - It is called just before the user _start code from i386/elf/start.S, + It is called just before the user _start code from i386/start.S, with the stack set up as that code gets it. */ /* NOTE! The linker notices the magical name `_init' and sets the DT_INIT diff --git a/sysdeps/mach/hurd/i386/static-start.S b/sysdeps/mach/hurd/i386/static-start.S index e30d226b2c..9c9c7b0fb7 100644 --- a/sysdeps/mach/hurd/i386/static-start.S +++ b/sysdeps/mach/hurd/i386/static-start.S @@ -1,5 +1,5 @@ /* Startup code for statically linked Hurd/i386 binaries. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998-2012 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 @@ -24,4 +24,4 @@ _start: jmp _start1 #define _start _start1 -#include <sysdeps/i386/elf/start.S> +#include <sysdeps/i386/start.S> diff --git a/sysdeps/mach/start.c b/sysdeps/mach/start.c deleted file mode 100644 index 59e1ab6ba4..0000000000 --- a/sysdeps/mach/start.c +++ /dev/null @@ -1,103 +0,0 @@ -/* Copyright (C) 1992, 1993, 1994, 1995, 1997 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, see - <http://www.gnu.org/licenses/>. */ - -#include <stddef.h> -#include <stdlib.h> -#include <errno.h> -#include <unistd.h> -#include <sysdep.h> - -#ifndef __GNUC__ - #error This file uses GNU C extensions; you must compile with GCC. -#endif - -/* The first piece of initialized data. */ -int __data_start = 0; - -#ifndef _HURD_THREADVAR_H -volatile int errno; -#endif - -extern void __mach_init (void); -extern void __libc_init (int argc, char **argv, char **envp); -extern int main (int argc, char **argv, char **envp); - -/* These are uninitialized common definitions so they will be zero - by default. If the user links in C threads, that will provide initialized - definitions that override these. */ -void *(*_cthread_init_routine) (void); /* Returns new SP to use. */ -void (*_cthread_exit_routine) (int status); - - -/* These are for communication from _start to start1, - where we cannot use the stack for anything. */ -static int start_argc; -static char **start_argv; - -/* _start calls this on the new stack. */ -static volatile void -start1 (void) -{ - __libc_init (start_argc, start_argv, __environ); - - (_cthread_exit_routine != NULL ? *_cthread_exit_routine : exit) - (main (start_argc, start_argv, __environ)); - - /* Should never get here. */ - LOSE; -} - -#ifndef START_ARGS -#define START_ARGS void -#endif -#ifdef START_MACHDEP -START_MACHDEP -#define _start _start0 -#endif - -void -_start (START_ARGS) -{ - SNARF_ARGS (start_argc, start_argv, __environ); - - __mach_init (); - - if (_cthread_init_routine != NULL) - CALL_WITH_SP (start1, (*_cthread_init_routine) ()); - else - start1 (); - - /* Should never get here. */ - LOSE; -} diff --git a/sysdeps/sh/init-first.c b/sysdeps/sh/init-first.c index c2e45e4287..f298724c1d 100644 --- a/sysdeps/sh/init-first.c +++ b/sysdeps/sh/init-first.c @@ -48,7 +48,7 @@ init (int *data) #ifdef SHARED /* This function is called to initialize the shared C library. - It is called just before the user _start code from sh/sh[34]/elf/start.S, + It is called just before the user _start code from sh/sh[34]/start.S, with the stack set up as that code gets it. */ /* NOTE! The linker notices the magical name `_init' and sets the DT_INIT |