summary refs log tree commit diff
path: root/elf/dl-support.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/dl-support.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/dl-support.c')
-rw-r--r--elf/dl-support.c9
1 files changed, 8 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