summary refs log tree commit diff
path: root/elf/rtld.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-07-24 18:33:44 +0000
committerUlrich Drepper <drepper@redhat.com>2008-07-24 18:33:44 +0000
commit0e077a7eea286a8efd63460d0ea5d99e44a86b71 (patch)
tree38d71e27469168c43fd230adeb20b206eb156b39 /elf/rtld.c
parent579cdf5a473e1e14e67539103b4cb525f8b7cf6e (diff)
downloadglibc-0e077a7eea286a8efd63460d0ea5d99e44a86b71.tar.gz
glibc-0e077a7eea286a8efd63460d0ea5d99e44a86b71.tar.xz
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/rtld.c')
-rw-r--r--elf/rtld.c2
1 files changed, 2 insertions, 0 deletions
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: