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>

diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h
index 75fbb88f782414856022afc4380586ec247f4489..7ea645d03f2dced5e2ba4c26fab8eca03d9465aa 100644 (file)
--- 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.