diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-08-29 07:42:08 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-08-29 07:42:08 +0000 |
| commit | 315a43aa949b25896c511fa6e2efd6be57e2e01d (patch) | |
| tree | 625aa5d40df04b92dcd3bd8128d30e52a45975ac /elf | |
| parent | 2fb513c60061821c7e5e7fb6014d2afd0308b7e9 (diff) | |
| download | glibc-315a43aa949b25896c511fa6e2efd6be57e2e01d.tar.gz | |
Updated to fedora-glibc-20080828T1623cvs/fedora-glibc-2_8_90-12
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 4 | ||||
| -rw-r--r-- | elf/dl-support.c | 7 | ||||
| -rw-r--r-- | elf/dl-sysdep.c | 3 | ||||
| -rw-r--r-- | elf/rtld.c | 2 |
4 files changed, 2 insertions, 14 deletions
diff --git a/elf/Makefile b/elf/Makefile index b89528c0fa..c25a0c4b26 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -841,8 +841,8 @@ $(objpfx)tst-dlmodcount: $(libdl) $(objpfx)tst-dlmodcount.out: $(test-modules) check-data := $(firstword $(wildcard \ - $(foreach D,$(add-ons) scripts/data,\ - $(patsubst %,$(..)$D/localplt-%.data,\ + $(foreach D,$(add-ons) scripts,\ + $(patsubst %,$(..)$D/data/localplt-%.data,\ $(abi-name) \ $(addsuffix -$(config-os),\ $(config-machine) \ 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: |