aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-08-14 17:11:07 +0000
committerUlrich Drepper <drepper@redhat.com>2008-08-14 17:11:07 +0000
commit9cf73ab08a912e6dab7ebe7b5477342afbde825d (patch)
treee6082e1f405ae06b5c5e554358585a52d58652b1 /elf
parent7b3ba2c4ebbe28d60224d79c7b7aa2a0e28fca78 (diff)
downloadglibc-9cf73ab08a912e6dab7ebe7b5477342afbde825d.tar
glibc-9cf73ab08a912e6dab7ebe7b5477342afbde825d.tar.gz
glibc-9cf73ab08a912e6dab7ebe7b5477342afbde825d.tar.bz2
glibc-9cf73ab08a912e6dab7ebe7b5477342afbde825d.zip
* sysdeps/unix/sysv/linux/dl-origin.c (_dl_get_origin): Undo all
change related to AT_EXECFN. We cannot use that string. * sysdeps/generic/ldsodefs.h (struct rtld_global_ro): Remove _dl_execfn member. * elf/dl-support.c: Remove _dl_execfn variable. (_dl_aux_init): Remove handling of AT_EXECFN. * elf/dl-sysdep.c (_dl_sysdep_start): Remove handling of AT_EXECFN. * elf/rtld.c (process_envvars): Remove use of __ASSUME_AT_EXECFN.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-support.c7
-rw-r--r--elf/dl-sysdep.c3
-rw-r--r--elf/rtld.c2
3 files changed, 0 insertions, 12 deletions
diff --git a/elf/dl-support.c b/elf/dl-support.c
index e5b74fb4d6..6bd573ec57 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -62,12 +62,8 @@ 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;
@@ -220,9 +216,6 @@ _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 622eeb626b..e6f4272a63 100644
--- a/elf/dl-sysdep.c
+++ b/elf/dl-sysdep.c
@@ -173,9 +173,6 @@ _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
diff --git a/elf/rtld.c b/elf/rtld.c
index 3f2267af0e..46bece7fa3 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2579,12 +2579,10 @@ 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: