diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-11-10 09:02:52 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-11-10 09:02:52 +0000 |
| commit | 3504bb650f48534549bbd0313dc15fa71455e302 (patch) | |
| tree | 742dd9cbcee1147fb36bcc02816bec415544597e /sysdeps/generic | |
| parent | cbf4bcd2b3d53de274548dbf4c28017d1f07d5b2 (diff) | |
Updated to fedora-glibc-20041110T0839
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/dl-sysdep.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 2 | ||||
| -rw-r--r-- | sysdeps/generic/sysconf.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/tempname.c | 3 | ||||
| -rw-r--r-- | sysdeps/generic/utime.c | 1 |
5 files changed, 9 insertions, 3 deletions
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index 429947ccd9..34498a880c 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -161,6 +161,8 @@ _dl_sysdep_start (void **start_argptr, case AT_SYSINFO: new_sysinfo = av->a_un.a_val; break; +#endif +#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO case AT_SYSINFO_EHDR: GLRO(dl_sysinfo_dso) = av->a_un.a_ptr; break; @@ -287,10 +289,8 @@ _dl_show_auxv (void) [AT_UCACHEBSIZE - 2] = { "AT_UCACHEBSIZE: 0x", hex }, [AT_IGNOREPPC - 2] = { "AT_IGNOREPPC", ignore }, [AT_SECURE - 2] = { "AT_SECURE: ", dec }, -#ifdef NEED_DL_SYSINFO [AT_SYSINFO - 2] = { "AT_SYSINFO: 0x", hex }, [AT_SYSINFO_EHDR - 2] = { "AT_SYSINFO_EHDR: 0x", hex }, -#endif }; unsigned int idx = (unsigned int) (av->a_type - 2); diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index fd45bdc87f..ec68e1a565 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -470,7 +470,9 @@ struct rtld_global_ro #ifdef NEED_DL_SYSINFO /* Syscall handling improvements. This is very specific to x86. */ EXTERN uintptr_t _dl_sysinfo; +#endif +#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO /* The vsyscall page is a virtual DSO pre-mapped by the kernel. This points to its ELF header. */ EXTERN const ElfW(Ehdr) *_dl_sysinfo_dso; diff --git a/sysdeps/generic/sysconf.c b/sysdeps/generic/sysconf.c index d67e3568a3..f22685cb29 100644 --- a/sysdeps/generic/sysconf.c +++ b/sysdeps/generic/sysconf.c @@ -18,6 +18,8 @@ 02111-1307 USA. */ #include <errno.h> +#include <grp.h> +#include <pwd.h> #include <stdio.h> #include <unistd.h> #include <time.h> diff --git a/sysdeps/generic/tempname.c b/sysdeps/generic/tempname.c index fd4db36dc3..60c94d6409 100644 --- a/sysdeps/generic/tempname.c +++ b/sysdeps/generic/tempname.c @@ -25,11 +25,12 @@ template suitable for use in __gen_tempname into TMPL, bounded by TMPL_LEN. */ int -__path_search (tmpl, tmpl_len, dir, pfx) +__path_search (tmpl, tmpl_len, dir, pfx, try_tmpdir) char *tmpl; size_t tmpl_len; const char *dir; const char *pfx; + int try_tmpdir; { __set_errno (ENOSYS); return -1; diff --git a/sysdeps/generic/utime.c b/sysdeps/generic/utime.c index 09d0cc6679..3a3bcc38cc 100644 --- a/sysdeps/generic/utime.c +++ b/sysdeps/generic/utime.c @@ -17,6 +17,7 @@ 02111-1307 USA. */ #include <errno.h> +#include <stddef.h> #include <utime.h> |