diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-07-24 18:33:44 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-07-24 18:33:44 +0000 |
| commit | 0e077a7eea286a8efd63460d0ea5d99e44a86b71 (patch) | |
| tree | 38d71e27469168c43fd230adeb20b206eb156b39 /elf | |
| parent | 579cdf5a473e1e14e67539103b4cb525f8b7cf6e (diff) | |
| download | glibc-0e077a7eea286a8efd63460d0ea5d99e44a86b71.tar glibc-0e077a7eea286a8efd63460d0ea5d99e44a86b71.tar.gz glibc-0e077a7eea286a8efd63460d0ea5d99e44a86b71.tar.bz2 glibc-0e077a7eea286a8efd63460d0ea5d99e44a86b71.zip | |
* elf/elf.h: Define AT_EXECFN.
* elf/rtld.c [!__ASSUME_AT_EXECFN] (process_envvars): Don't handle
LD_ORIGIN_PATH.
* elf/dl-sysdep.c (_dl_sysdep_start): Handle AT_EXECFN.
* elf/dl-support.c: Define _dl_execfn. Don't define _dl_origin_path
if __ASSUME_AT_EXECFN is defined.
(_dl_aux_init): Handle AT_EXECFN.
* sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_AT_EXECFN
for 2.6.27 and up.
* sysdeps/generic/ldsodefs.h (rtld_global_ro): Add _dl_execfn.
Don't define _dl_origin_path if __ASSUME_AT_EXECFN is defined.
* sysdeps/unix/sysv/linux/dl-origin.c (_dl_get_origin): Use
_dl_execfn if available and avoid compatibility code if
__ASSUME_AT_EXECFN is defined.
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-support.c | 9 | ||||
| -rw-r--r-- | elf/dl-sysdep.c | 3 | ||||
| -rw-r--r-- | elf/elf.h | 2 | ||||
| -rw-r--r-- | elf/rtld.c | 2 |
4 files changed, 15 insertions, 1 deletions
diff --git a/elf/dl-support.c b/elf/dl-support.c index 2c11ac6881..e5b74fb4d6 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -1,5 +1,5 @@ /* Support for dynamic linking code in static libc. - Copyright (C) 1996-2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1996-2005, 2006, 2007, 2008 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 @@ -62,8 +62,12 @@ struct link_map *_dl_profile_map; /* This is the address of the last stack address ever used. */ void *__libc_stack_end; +#ifndef __ASSUME_AT_EXECFN /* Path where the binary is found. */ const char *_dl_origin_path; +#endif +/* File Name of the executable. */ +const char *_dl_execfn; /* Nonzero if runtime lookup should not update the .got/.plt. */ int _dl_bind_not; @@ -216,6 +220,9 @@ _dl_aux_init (ElfW(auxv_t) *av) __libc_enable_secure = av->a_un.a_val; __libc_enable_secure_decided = 1; break; + case AT_EXECFN: + GLRO(dl_execfn) = (void *) av->a_un.a_val; + break; # ifdef DL_PLATFORM_AUXV DL_PLATFORM_AUXV # endif diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c index dd55905e14..1ff7a350be 100644 --- a/elf/dl-sysdep.c +++ b/elf/dl-sysdep.c @@ -173,6 +173,9 @@ _dl_sysdep_start (void **start_argptr, GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val; break; #endif + case AT_EXECFN: + GLRO(dl_execfn) = (void *) av->a_un.a_val; + break; #ifdef DL_PLATFORM_AUXV DL_PLATFORM_AUXV #endif @@ -970,6 +970,8 @@ typedef struct #define AT_SECURE 23 /* Boolean, was exec setuid-like? */ +#define AT_EXECFN 31 /* Filename of executable. */ + /* Pointer to the global system page used for system calls and other nice things. */ #define AT_SYSINFO 32 diff --git a/elf/rtld.c b/elf/rtld.c index 46bece7fa3..3f2267af0e 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -2579,10 +2579,12 @@ process_envvars (enum mode *modep) break; case 11: +#ifndef __ASSUME_AT_EXECFN /* Path where the binary is found. */ if (!INTUSE(__libc_enable_secure) && memcmp (envline, "ORIGIN_PATH", 11) == 0) GLRO(dl_origin_path) = &envline[12]; +#endif break; case 12: |