mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-30 22:41:06 +00:00
Clean up init-first.c files.
This commit is contained in:
Roland McGrath
parent
55a051c985
commit
93c65d4384
11
ChangeLog
11
ChangeLog
@ -1,3 +1,14 @@
|
||||
2012-10-01 Roland McGrath <roland@hack.frob.com>
|
||||
|
||||
* sysdeps/unix/sysv/linux/init-first.c: Moved to ...
|
||||
* csu/init-first.c: ... here.
|
||||
* sysdeps/unix/sysv/linux/powerpc/init-first.c: Update #include.
|
||||
* sysdeps/unix/sysv/linux/s390/init-first.c: Likewise.
|
||||
* sysdeps/unix/sysv/linux/x86_64/init-first.c: Likewise.
|
||||
* sysdeps/unix/sysv/linux/x86_64/x32/init-first.c: Likewise.
|
||||
* sysdeps/i386/init-first.c: File removed.
|
||||
* sysdeps/sh/init-first.c: File removed.
|
||||
|
||||
2012-10-01 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
[BZ #14645]
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* Initialization code run first thing by the ELF startup code. Stub version.
|
||||
/* Initialization code run first thing by the ELF startup code. Common version
|
||||
Copyright (C) 1995-2012 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
@ -17,40 +17,76 @@
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <ctype.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <sysdep.h>
|
||||
#include <fpu_control.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/types.h>
|
||||
#include <libc-internal.h>
|
||||
|
||||
#include <ldsodefs.h>
|
||||
|
||||
/* Set nonzero if we have to be prepared for more then one libc being
|
||||
used in the process. Safe assumption if initializer never runs. */
|
||||
int __libc_multiple_libcs attribute_hidden = 1;
|
||||
|
||||
extern void __libc_init (int, char **, char **);
|
||||
#ifdef USE_NONOPTION_FLAGS
|
||||
extern void __getopt_clean_environment (char **);
|
||||
#endif
|
||||
/* Remember the command line argument and enviroment contents for
|
||||
later calls of initializers for dynamic libraries. */
|
||||
int __libc_argc attribute_hidden;
|
||||
char **__libc_argv attribute_hidden;
|
||||
|
||||
|
||||
#ifdef SHARED
|
||||
void
|
||||
__libc_init_first (void)
|
||||
__libc_init_first (int argc, char **argv, char **envp)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef SHARED
|
||||
/* 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
|
||||
#else
|
||||
void __libc_init_first
|
||||
#endif
|
||||
(int argc, char *arg0, ...)
|
||||
{
|
||||
char **argv = &arg0, **envp = &argv[argc + 1];
|
||||
/* For DSOs we do not need __libc_init_first but instead _init. */
|
||||
}
|
||||
|
||||
void
|
||||
attribute_hidden
|
||||
_init (int argc, char **argv, char **envp)
|
||||
{
|
||||
#endif
|
||||
#ifdef USE_NONOPTION_FLAGS
|
||||
extern void __getopt_clean_environment (char **);
|
||||
#endif
|
||||
|
||||
__libc_multiple_libcs = &_dl_starting_up && !_dl_starting_up;
|
||||
|
||||
/* Make sure we don't initialize twice. */
|
||||
if (!__libc_multiple_libcs)
|
||||
{
|
||||
/* Set the FPU control word to the proper default value if the
|
||||
kernel would use a different value. (In a static program we
|
||||
don't have this information.) */
|
||||
#ifdef SHARED
|
||||
if (__fpu_control != GLRO(dl_fpu_control))
|
||||
#endif
|
||||
__setfpucw (__fpu_control);
|
||||
}
|
||||
|
||||
/* Save the command-line arguments. */
|
||||
__libc_argc = argc;
|
||||
__libc_argv = argv;
|
||||
__environ = envp;
|
||||
__libc_init (argc, argv, envp);
|
||||
|
||||
#ifndef SHARED
|
||||
__libc_init_secure ();
|
||||
|
||||
/* First the initialization which normally would be done by the
|
||||
dynamic linker. */
|
||||
_dl_non_dynamic_init ();
|
||||
#endif
|
||||
|
||||
#ifdef VDSO_SETUP
|
||||
VDSO_SETUP ();
|
||||
#endif
|
||||
|
||||
__init_misc (argc, argv, envp);
|
||||
|
||||
#ifdef USE_NONOPTION_FLAGS
|
||||
/* This is a hack to make the special getopt in GNU libc working. */
|
||||
@ -59,4 +95,21 @@ void __libc_init_first
|
||||
|
||||
/* Initialize ctype data. */
|
||||
__ctype_init ();
|
||||
|
||||
#if defined SHARED && !defined NO_CTORS_DTORS_SECTIONS
|
||||
__libc_global_ctors ();
|
||||
#endif
|
||||
}
|
||||
|
||||
/* This function is defined here so that if this file ever gets into
|
||||
ld.so we will get a link error. Having this file silently included
|
||||
in ld.so causes disaster, because the _init definition above will
|
||||
cause ld.so to gain an init function, which is not a cool thing. */
|
||||
|
||||
extern void _dl_start (void) __attribute__ ((noreturn));
|
||||
|
||||
void
|
||||
_dl_start (void)
|
||||
{
|
||||
abort ();
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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
|
||||
}
|
||||
@ -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>
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
/* Initialization code run first thing by the ELF startup code. For i386/Unix.
|
||||
Copyright (C) 1995-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
|
||||
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 <ctype.h>
|
||||
#include <unistd.h>
|
||||
|
||||
extern void __libc_init (int, char **, char **);
|
||||
#ifdef USE_NONOPTION_FLAGS
|
||||
extern void __getopt_clean_environment (char **);
|
||||
#endif
|
||||
extern void __libc_global_ctors (void);
|
||||
|
||||
int __libc_multiple_libcs attribute_hidden = 1;
|
||||
|
||||
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 USE_NONOPTION_FLAGS
|
||||
/* This is a hack to make the special getopt in GNU libc working. */
|
||||
__getopt_clean_environment (envp);
|
||||
#endif
|
||||
|
||||
/* Initialize ctype data. */
|
||||
__ctype_init ();
|
||||
}
|
||||
|
||||
#ifdef SHARED
|
||||
/* This function is called to initialize the shared C library.
|
||||
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
|
||||
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
|
||||
}
|
||||
@ -1,78 +0,0 @@
|
||||
/* Initialization code run first thing by the ELF startup code. For SH.
|
||||
Copyright (C) 1995-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
|
||||
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 <ctype.h>
|
||||
#include <unistd.h>
|
||||
|
||||
extern void __libc_init (int, char **, char **);
|
||||
#ifdef USE_NONOPTION_FLAGS
|
||||
extern void __getopt_clean_environment (char **);
|
||||
#endif
|
||||
extern void __libc_global_ctors (void);
|
||||
|
||||
int __libc_multiple_libcs attribute_hidden = 1;
|
||||
|
||||
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 USE_NONOPTION_FLAGS
|
||||
/* This is a hack to make the special getopt in GNU libc working. */
|
||||
__getopt_clean_environment (envp);
|
||||
#endif
|
||||
|
||||
/* Initialize ctype data. */
|
||||
__ctype_init ();
|
||||
}
|
||||
|
||||
#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]/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
|
||||
}
|
||||
@ -1,115 +0,0 @@
|
||||
/* Initialization code run first thing by the ELF startup code. Linux version.
|
||||
Copyright (C) 1995-2004, 2005, 2007, 2011 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 <ctype.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <sysdep.h>
|
||||
#include <fpu_control.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/types.h>
|
||||
#include <libc-internal.h>
|
||||
|
||||
#include <ldsodefs.h>
|
||||
|
||||
/* Set nonzero if we have to be prepared for more then one libc being
|
||||
used in the process. Safe assumption if initializer never runs. */
|
||||
int __libc_multiple_libcs attribute_hidden = 1;
|
||||
|
||||
/* Remember the command line argument and enviroment contents for
|
||||
later calls of initializers for dynamic libraries. */
|
||||
int __libc_argc attribute_hidden;
|
||||
char **__libc_argv attribute_hidden;
|
||||
|
||||
|
||||
void
|
||||
__libc_init_first (int argc, char **argv, char **envp)
|
||||
{
|
||||
#ifdef SHARED
|
||||
/* For DSOs we do not need __libc_init_first but instead _init. */
|
||||
}
|
||||
|
||||
void
|
||||
attribute_hidden
|
||||
_init (int argc, char **argv, char **envp)
|
||||
{
|
||||
#endif
|
||||
#ifdef USE_NONOPTION_FLAGS
|
||||
extern void __getopt_clean_environment (char **);
|
||||
#endif
|
||||
|
||||
__libc_multiple_libcs = &_dl_starting_up && !_dl_starting_up;
|
||||
|
||||
/* Make sure we don't initialize twice. */
|
||||
if (!__libc_multiple_libcs)
|
||||
{
|
||||
/* Set the FPU control word to the proper default value if the
|
||||
kernel would use a different value. (In a static program we
|
||||
don't have this information.) */
|
||||
#ifdef SHARED
|
||||
if (__fpu_control != GLRO(dl_fpu_control))
|
||||
#endif
|
||||
__setfpucw (__fpu_control);
|
||||
}
|
||||
|
||||
/* Save the command-line arguments. */
|
||||
__libc_argc = argc;
|
||||
__libc_argv = argv;
|
||||
__environ = envp;
|
||||
|
||||
#ifndef SHARED
|
||||
__libc_init_secure ();
|
||||
|
||||
/* First the initialization which normally would be done by the
|
||||
dynamic linker. */
|
||||
_dl_non_dynamic_init ();
|
||||
#endif
|
||||
|
||||
#ifdef VDSO_SETUP
|
||||
VDSO_SETUP ();
|
||||
#endif
|
||||
|
||||
__init_misc (argc, argv, envp);
|
||||
|
||||
#ifdef USE_NONOPTION_FLAGS
|
||||
/* This is a hack to make the special getopt in GNU libc working. */
|
||||
__getopt_clean_environment (envp);
|
||||
#endif
|
||||
|
||||
/* Initialize ctype data. */
|
||||
__ctype_init ();
|
||||
|
||||
#if defined SHARED && !defined NO_CTORS_DTORS_SECTIONS
|
||||
__libc_global_ctors ();
|
||||
#endif
|
||||
}
|
||||
|
||||
/* This function is defined here so that if this file ever gets into
|
||||
ld.so we will get a link error. Having this file silently included
|
||||
in ld.so causes disaster, because the _init definition above will
|
||||
cause ld.so to gain an init function, which is not a cool thing. */
|
||||
|
||||
extern void _dl_start (void) __attribute__ ((noreturn));
|
||||
|
||||
void
|
||||
_dl_start (void)
|
||||
{
|
||||
abort ();
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
/* Copyright (C) 2007 Free Software Foundation, Inc.
|
||||
/* Initialization code run first thing by the ELF startup code. Linux/PowerPC.
|
||||
Copyright (C) 2007-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
|
||||
@ -45,4 +46,4 @@ _libc_vdso_platform_setup (void)
|
||||
# define VDSO_SETUP _libc_vdso_platform_setup
|
||||
#endif
|
||||
|
||||
#include "../init-first.c"
|
||||
#include <csu/init-first.c>
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
/* Copyright (C) 2008 Free Software Foundation, Inc.
|
||||
/* Initialization code run first thing by the ELF startup code. Linux/s390.
|
||||
Copyright (C) 2008-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
|
||||
@ -46,4 +47,4 @@ _libc_vdso_platform_setup (void)
|
||||
# define VDSO_SETUP _libc_vdso_platform_setup
|
||||
#endif
|
||||
|
||||
#include "../init-first.c"
|
||||
#include <csu/init-first.c>
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
/* Copyright (C) 2007, 2011 Free Software Foundation, Inc.
|
||||
/* Initialization code run first thing by the ELF startup code. Linux/x86-64.
|
||||
Copyright (C) 2007-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
|
||||
@ -54,4 +55,4 @@ _libc_vdso_platform_setup (void)
|
||||
# define VDSO_SETUP _libc_vdso_platform_setup
|
||||
#endif
|
||||
|
||||
#include "../init-first.c"
|
||||
#include <csu/init-first.c>
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
/* Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
/* Initialization code run first thing by the ELF startup code. Linux/x32.
|
||||
Copyright (C) 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
|
||||
@ -37,4 +38,4 @@ _libc_vdso_platform_setup (void)
|
||||
# define VDSO_SETUP _libc_vdso_platform_setup
|
||||
#endif
|
||||
|
||||
#include "../../init-first.c"
|
||||
#include <csu/init-first.c>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user