diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/i386/init-first.c | 45 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/init-first.c | 4 | ||||
| -rw-r--r-- | sysdeps/stub/sys/ipc_buf.h | 3 | ||||
| -rw-r--r-- | sysdeps/stub/sys/sem_buf.h | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/fpu_control.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/init-first.S | 84 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/init-first.c | 72 |
7 files changed, 119 insertions, 102 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 } diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c index a23d201e58..ba39a70d23 100644 --- a/sysdeps/mach/hurd/i386/init-first.c +++ b/sysdeps/mach/hurd/i386/init-first.c @@ -27,6 +27,7 @@ Cambridge, MA 02139, USA. */ extern void __mach_init (void); extern void __libc_init (int, char **, char **); +extern void __libc_global_ctors (void); void *(*_cthread_init_routine) (void); /* Returns new SP to use. */ void (*_cthread_exit_routine) (int status) __attribute__ ((__noreturn__)); @@ -93,6 +94,9 @@ init1 (int argc, char *arg0, ...) d->intarray, d->intarraysize); __libc_init (argc, argv, __environ); +#ifdef PIC + __libc_global_ctors (); +#endif } static void diff --git a/sysdeps/stub/sys/ipc_buf.h b/sysdeps/stub/sys/ipc_buf.h index fc2ad03873..d62d2c14ce 100644 --- a/sysdeps/stub/sys/ipc_buf.h +++ b/sysdeps/stub/sys/ipc_buf.h @@ -36,9 +36,6 @@ Boston, MA 02111-1307, USA. */ __BEGIN_DECLS -/* Data type for key value. */ -typedef int key_t; - /* Special key values. */ #define IPC_PRIVATE ((key_t) 0) /* private key */ diff --git a/sysdeps/stub/sys/sem_buf.h b/sysdeps/stub/sys/sem_buf.h index b301525408..194eb149ec 100644 --- a/sysdeps/stub/sys/sem_buf.h +++ b/sysdeps/stub/sys/sem_buf.h @@ -47,6 +47,15 @@ struct semid_ds unsigned short int sem_nsems; /* number of semaphores in set */ }; +/* Union used for argument for `semctl'. */ +union semun +{ + int val; /* value for SETVAL */ + struct semid_ds *buf; /* buffer for IPC_STAT & IPC_SET */ + unsigned short int *array; /* array for GETALL & SETALL */ + struct seminfo *__buf; /* buffer for IPC_INFO */ + }; + __END_DECLS #endif /* sys/sem_buf.h */ diff --git a/sysdeps/unix/sysv/linux/i386/fpu_control.h b/sysdeps/unix/sysv/linux/i386/fpu_control.h index 28f3eeba7b..470e960853 100644 --- a/sysdeps/unix/sysv/linux/i386/fpu_control.h +++ b/sysdeps/unix/sysv/linux/i386/fpu_control.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Olaf Flebbe. @@ -88,7 +88,7 @@ Boston, MA 02111-1307, USA. */ #define _FPU_IEEE 0x137f /* private namespace. It should only be used in init-first.o. */ -extern unsigned short __fpu_control; +extern unsigned short ___fpu_control; __BEGIN_DECLS diff --git a/sysdeps/unix/sysv/linux/i386/init-first.S b/sysdeps/unix/sysv/linux/i386/init-first.S deleted file mode 100644 index 3c0c185fb7..0000000000 --- a/sysdeps/unix/sysv/linux/i386/init-first.S +++ /dev/null @@ -1,84 +0,0 @@ -/* Initialization code run first thing by the ELF startup code. - For i386/Linux. -Copyright (C) 1995 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 Library General Public License as -published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <sysdep.h> - - .text - - /* Called from start.S. Not: there is no value in %ebx. */ - -ENTRY (__libc_init_first) - - /* Make sure we are not using iBSC2 personality. */ - movl $SYS_ify (personality), %eax - xorl %ebx, %ebx - int $0x80 - -#ifdef PIC - /* Set control work of FPU. */ - call .L0 -.L0: popl %ebx - addl $_GLOBAL_OFFSET_TABLE_+[.-.L0], %ebx - movzwl C_SYMBOL_NAME(___fpu_control@GOT)(%ebx), %eax -#else - movzwl ___fpu_control, %eax -#endif - pushl %eax - call JUMPTARGET(__setfpucw) - addl $4, %esp - - /* That is all for now. */ - ret - - - /* This is only a dummy function for the list below. */ - .type _dummy_exit, @function -C_LABEL(_dummy_exit) - ret - - - .section .init,"ax",@progbits - movl 16(%ebp), %edx /* envp */ - movl 12(%ebp), %ecx /* argv */ - movl 8(%ebp), %eax /* argc */ - pushl %edx - pushl %ecx - pushl %eax - - call JUMPTARGET(__libc_init) - - addl $12, %esp - - - /* Make sure __libc_subinit section is always present. */ - .section __libc_subinit, "a", @progbits - .align 4 - .type __elf_set___libc_subinit_element__dummy_exit__, @object - .size __elf_set___libc_subinit_element__dummy_exit__, 4 -__elf_set___libc_subinit_element__dummy_exit__: - .long _dummy_exit - - /* Make sure __libc_atexit section is always present. */ - .section __libc_atexit, "a", @progbits - .align 4 - .type __elf_set___libc_atexit_element__dummy_exit__, @object - .size __elf_set___libc_atexit_element__dummy_exit__, 4 -__elf_set___libc_atexit_element__dummy_exit__: - .long _dummy_exit diff --git a/sysdeps/unix/sysv/linux/i386/init-first.c b/sysdeps/unix/sysv/linux/i386/init-first.c new file mode 100644 index 0000000000..0177daae24 --- /dev/null +++ b/sysdeps/unix/sysv/linux/i386/init-first.c @@ -0,0 +1,72 @@ +/* Initialization code run first thing by the ELF startup code. i386/Linux +Copyright (C) 1995 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 Library General Public License as +published by the Free Software Foundation; either version 2 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 +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#include <unistd.h> +#include "fpu_control.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]; + + /* Make sure we are not using iBSC2 personality. */ + asm ("int $0x80 # syscall no %0, arg %1" + : : "a" (SYS_ify (personality)), "b" (0)); + + /* Set the FPU control word to the proper default value. */ + __setfpucw (___fpu_control); + + __environ = envp; + __libc_init (argc, argv, envp); +} + +#ifdef PIC +/* 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 +_init (int argc, ...) +{ + init (&argc); + + __libc_global_ctors (); +} +#endif + + +void +__libc_init_first (int argc __attribute__ ((unused)), ...) +{ +#ifndef PIC + init (&argc); +#endif +} |