aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.ibm.com>2018-08-02 13:57:26 -0300
committerGabriel F. T. Gomes <gabrielftg@linux.ibm.com>2019-08-01 14:01:04 -0300
commit9ca2648e2aa7094e022d5150281b2575f866259f (patch)
tree9d99349f9bf5bec682bc292c6f46e507b2b0ec22 /elf
parent0a8262a1b269f8f1602933248e69dfb041aab7a2 (diff)
downloadglibc-9ca2648e2aa7094e022d5150281b2575f866259f.zip
glibc-9ca2648e2aa7094e022d5150281b2575f866259f.tar.gz
glibc-9ca2648e2aa7094e022d5150281b2575f866259f.tar.bz2
Let ld.so have flags DT_RPATH and DT_RUNPATH
2018-08-02 Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com> * elf/get-dynamic-info.h: Remove asserts that prevent ld.so from having the flags DT_RPATH and DT_RUNPATH. Signed-off-by: Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
Diffstat (limited to 'elf')
-rw-r--r--elf/get-dynamic-info.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h
index 75fbb88..7ea645d 100644
--- a/elf/get-dynamic-info.h
+++ b/elf/get-dynamic-info.h
@@ -142,10 +142,7 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
assert (info[DT_FLAGS] == NULL
|| (info[DT_FLAGS]->d_un.d_val & ~DF_BIND_NOW) == 0);
#endif
-#if defined RTLD_BOOTSTRAP || defined STATIC_PIE_BOOTSTRAP
- assert (info[DT_RUNPATH] == NULL);
- assert (info[DT_RPATH] == NULL);
-#else
+#if ! defined RTLD_BOOTSTRAP && ! defined STATIC_PIE_BOOTSTRAP
if (info[DT_FLAGS] != NULL)
{
/* Flags are used. Translate to the old form where available.