From a9fa33ba8b19676ef2ce894c97b8a1f0a486b834 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Sat, 23 Jun 2012 12:27:58 +0200 Subject: Some missing bits from sysdeps/*/elf dismissal. This fixes up commits 735095ae9566b2b14e8210e5ed44b3d5b51495f1, 09ae94c11b4309b425fbbfaa095e64cac2ae8cb8, and ff962fb6a10c46052535d482c889b3a9e5236637. --- sysdeps/mach/hurd/i386/static-start.S | 4 +- sysdeps/mach/start.c | 103 ---------------------------------- 2 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 sysdeps/mach/start.c (limited to 'sysdeps/mach') 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 +#include 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 - . */ - -#include -#include -#include -#include -#include - -#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; -} -- cgit 1.4.1