diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-01-20 17:34:29 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-01-20 17:34:29 +0100 |
| commit | f0dfc72f9d9bae2e8b210113ca2c4a4428d4cb5b (patch) | |
| tree | f7454314d1fe7c613ecded2a524004fff3942593 /sysdeps/generic | |
| parent | 1795b735237206f4798e2ff831327521e14dde2c (diff) | |
| parent | e3b7670be21d6992e3ca9ee1ad3a5d08eb3a24c9 (diff) | |
| download | glibc-f0dfc72f9d9bae2e8b210113ca2c4a4428d4cb5b.tar.gz glibc-f0dfc72f9d9bae2e8b210113ca2c4a4428d4cb5b.tar.xz glibc-f0dfc72f9d9bae2e8b210113ca2c4a4428d4cb5b.zip | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index e18e60f73f..230c39a631 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1,5 +1,5 @@ /* Run-time dynamic linker data structures for loaded ELF shared objects. - Copyright (C) 1995-2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1995-2009, 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 @@ -1015,7 +1015,8 @@ extern void *_dl_sysdep_read_whole_file (const char *file, size_t *sizep, extern ElfW(Addr) _dl_sysdep_start (void **start_argptr, void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phnum, - ElfW(Addr) *user_entry)) + ElfW(Addr) *user_entry, + ElfW(auxv_t) *auxv)) attribute_hidden; extern void _dl_sysdep_start_cleanup (void) |