diff options
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/bits/resource.h | 4 | ||||
| -rw-r--r-- | sysdeps/generic/libc-start.c | 37 | ||||
| -rw-r--r-- | sysdeps/generic/setsockopt.c | 4 |
3 files changed, 37 insertions, 8 deletions
diff --git a/sysdeps/generic/bits/resource.h b/sysdeps/generic/bits/resource.h index e29be98210..d0bbe30df0 100644 --- a/sysdeps/generic/bits/resource.h +++ b/sysdeps/generic/bits/resource.h @@ -1,5 +1,5 @@ /* Bit values & structures for resource limits. 4.4 BSD/generic GNU version. - Copyright (C) 1994, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1994, 1996, 1997, 1998 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 @@ -65,7 +65,7 @@ enum __rlimit_resource #define RLIMIT_NOFILE RLIMIT_NOFILE RLIMIT_NLIMITS, /* Number of limit flavors. */ - RLIM_NLIMITS = RLIMIT_NLIMITS, /* Traditional name for same. */ + RLIM_NLIMITS = RLIMIT_NLIMITS /* Traditional name for same. */ }; /* Value to indicate that there is no limit. */ diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c index d6fd3d3581..d32e54f162 100644 --- a/sysdeps/generic/libc-start.c +++ b/sysdeps/generic/libc-start.c @@ -16,29 +16,58 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <link.h> #include <stdlib.h> #include <unistd.h> +extern void __libc_init_first (int argc, char **argv, char **envp); + +extern int _dl_starting_up; +weak_extern (_dl_starting_up) +extern int __libc_multiple_libcs; + int __libc_start_main (int (*main) (int, char **, char **), int argc, char **argv, void (*init) (void), void (*fini) (void), void (*rtld_fini) (void)) { +#ifndef PIC + /* The next variable is only here to work around a bug in gcc <= 2.7.2.2. + If the address would be taken inside the expression the optimizer + would try to be too smart and throws it away. Grrr. */ + int *dummy_addr = &_dl_starting_up; + + __libc_multiple_libcs = dummy_addr && !_dl_starting_up; +#endif + /* Register the destructor of the dynamic linker if there is any. */ if (rtld_fini != NULL) atexit (rtld_fini); - /* Call the initializer of the libc. */ - __libc_init_first (); - /* Set the global _environ variable correctly. */ __environ = &argv[argc + 1]; + /* Call the initializer of the libc. */ +#ifdef PIC + if (_dl_debug_impcalls) + _dl_debug_message (1, "\ninitialize libc\n\n", NULL); +#endif + __libc_init_first (argc, argv, __environ); + /* Call the initializer of the program. */ +#ifdef PIC + if (_dl_debug_impcalls) + _dl_debug_message (1, "\ninitialize program: ", argv[0], "\n\n", NULL); +#endif (*init) (); /* Register the destructor of the program. */ atexit (fini); - exit ((*main) (argc, argv, envp)); +#ifdef PIC + if (_dl_debug_impcalls) + _dl_debug_message (1, "\ntransferring control: ", argv[0], "\n\n", NULL); +#endif + + exit ((*main) (argc, argv, __environ)); } diff --git a/sysdeps/generic/setsockopt.c b/sysdeps/generic/setsockopt.c index ba876438e5..3b6d741257 100644 --- a/sysdeps/generic/setsockopt.c +++ b/sysdeps/generic/setsockopt.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 1998 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 @@ -27,7 +27,7 @@ setsockopt (fd, level, optname, optval, optlen) int fd; int level; int optname; - void *optval; + const __ptr_t optval; socklen_t optlen; { __set_errno (ENOSYS); |