diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/ChangeLog.m68k | 5 | ||||
| -rw-r--r-- | ports/ChangeLog.mips | 4 | ||||
| -rw-r--r-- | ports/sysdeps/mips/init-first.c | 65 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/m68k/init-first.c | 5 |
4 files changed, 12 insertions, 67 deletions
diff --git a/ports/ChangeLog.m68k b/ports/ChangeLog.m68k index 5163cf3f7d..040c490275 100644 --- a/ports/ChangeLog.m68k +++ b/ports/ChangeLog.m68k @@ -1,3 +1,8 @@ +2012-09-28 Roland McGrath <roland@hack.frob.com> + + * sysdeps/unix/sysv/linux/m68k/init-first.c: Include main file from + csu/ rather than sysdeps/unix/sysv/linux/. + 2012-08-27 Joseph Myers <joseph@codesourcery.com> * sysdeps/unix/sysv/linux/m68k/kernel-features.h diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips index bef13624b3..dd92c3d90f 100644 --- a/ports/ChangeLog.mips +++ b/ports/ChangeLog.mips @@ -1,3 +1,7 @@ +2012-09-28 Roland McGrath <roland@hack.frob.com> + + * sysdeps/mips/init-first.c: File removed. + 2012-09-28 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/mips/dl-trampoline.c (VERSYMIDX): Removed. diff --git a/ports/sysdeps/mips/init-first.c b/ports/sysdeps/mips/init-first.c deleted file mode 100644 index 6a5e7caf09..0000000000 --- a/ports/sysdeps/mips/init-first.c +++ /dev/null @@ -1,65 +0,0 @@ -/* Initialization code run first thing by the ELF startup code. For mips/Unix. - Copyright (C) 1996, 1997, 2010 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. - - 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 <unistd.h> - -extern void __libc_init (int, char **, char **); -extern void __libc_global_ctors (void); - - -static void -init (int *data) -{ - int argc = *data; - char **argv = (void *) (data + 1); - char **envp = &argv[argc + 1]; - - __environ = envp; - __libc_init (argc, argv, envp); -} - -#ifdef SHARED -/* This function is called to initialize the shared C library. - It is called just before the user _start code from mips/elf/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 - 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, ...) -{ - init (&argc); - -#ifndef NO_CTORS_DTORS_SECTIONS - __libc_global_ctors (); -#endif -} -#endif - - -void -__libc_init_first (int argc __attribute__ ((unused)), ...) -{ -#ifndef SHARED - init (&argc); -#endif -} diff --git a/ports/sysdeps/unix/sysv/linux/m68k/init-first.c b/ports/sysdeps/unix/sysv/linux/m68k/init-first.c index ec311ec427..713ab86b16 100644 --- a/ports/sysdeps/unix/sysv/linux/m68k/init-first.c +++ b/ports/sysdeps/unix/sysv/linux/m68k/init-first.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2010 Free Software Foundation, Inc. +/* Initialization code run first thing by the ELF startup code. Linux/m68k. + Copyright (C) 2010-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Maxim Kuvyrkov <maxim@codesourcery.com>, 2010. @@ -70,4 +71,4 @@ _libc_vdso_platform_setup (void) #endif /* SHARED */ -#include <sysdeps/unix/sysv/linux/init-first.c> +#include <csu/init-first.c> |