diff options
author | Roland McGrath <roland@gnu.org> | 1995-09-21 06:24:21 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1995-09-21 06:24:21 +0000 |
commit | 0324daa0055227fdb157b8491d4e5bbe9d9d579a (patch) | |
tree | 1cc1994ae9fa52ba09e28498b50911628f366add /sysdeps/i386/init-first.c | |
parent | 600927014b78e4247e36bbc554c188c7a3cca40e (diff) | |
download | glibc-0324daa0055227fdb157b8491d4e5bbe9d9d579a.tar.gz glibc-0324daa0055227fdb157b8491d4e5bbe9d9d579a.tar.xz glibc-0324daa0055227fdb157b8491d4e5bbe9d9d579a.zip |
Thu Sep 21 00:03:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/stub/sys/sem_buf.h (union semun): New type. * sysdeps/mach/hurd/i386/init-first.c (init1) [PIC]: Call __libc_global_ctors. * sysdeps/i386/init-first.c: Rewritten. * sysdeps/unix/sysv/linux/i386/init-first.S: File removed. * sysdeps/unix/sysv/linux/i386/init-first.c: New file. * sysdeps/unix/sysv/linux/i386/fpu_control.h: Fix name in decl of ___fpu_control. * Makerules (build-shlib): New canned sequence, broken out of lib%.so rule. Link in $^ instead of just $<. (lib%.so: lib%_pic.a): Use it. (libc.so): New target; use $(build-shlib) for cmds, but also depend on soinit.so first and sofini.so last. * elf/soinit.c: New file. * elf/sofini.c: New file. * elf/Makefile (distribute): Add soinit.c and sofini.c. (extra-objs): Add soinit.so and sofini.so. * sysvipc/sys/shm.h (shmat): Fix return type to char *. * sysdeps/stub/sys/ipc_buf.h (key_t): Type removed. * misc/syslog.c (vsyslog): Rewritten using open_memstream to dynamically allocate buffers. * Makerules (install-lib-nosubdir): Make this, rather than install-no-libc.a, depend on the installed shared libraries.
Diffstat (limited to 'sysdeps/i386/init-first.c')
-rw-r--r-- | sysdeps/i386/init-first.c | 45 |
1 files changed, 32 insertions, 13 deletions
diff --git a/sysdeps/i386/init-first.c b/sysdeps/i386/init-first.c index aa36732f60..792702e024 100644 --- a/sysdeps/i386/init-first.c +++ b/sysdeps/i386/init-first.c @@ -20,26 +20,45 @@ Cambridge, MA 02139, USA. */ #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 PIC -static void soinit (int argc, char *arg0, ...) - __attribute__ ((unused, section (".init"))); +/* This function is called to initialize the shared C library. + It is called just before the user _start code from i386/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 -__libc_init_first (void) +_init (int argc, ...) { + init (&argc); + + __libc_global_ctors (); } #endif -#ifdef PIC -static void soinit -#else -void __libc_init_first -#endif -(int argc, char *arg0, ...) -{ - char **argv = &arg0, **envp = &argv[argc + 1]; - __environ = envp; - __libc_init (argc, argv, envp); +void +__libc_init_first (int argc __attribute__ ((unused)), ...) +{ +#ifndef PIC + init (&argc); +#endif } |