From: Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Date: Thu, 6 Aug 2015 19:13:56 +0000 (-0300)
Subject: Remove assert if DT_RUNPATH and DT_RPATH flags are found in ld.so
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3e9a246c1cf1eee1e1f1b8d629530834e4eb2ce;p=thirdparty%2Fglibc.git

Remove assert if DT_RUNPATH and DT_RPATH flags are found in ld.so
---

diff --git a/ChangeLog b/ChangeLog
index 84ae7a7af8d..d2f71250985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-06  Tulio Magno Quites Machado Filho  <tuliom@linux.vnet.ibm.com>
+
+	* elf/get-dynamic-info.h (elf_get_dynamic_info): Remove assert
+	if DT_RUNPATH and DT_RPATH flags are found in ld.so.
+
 2016-08-04  Carlos O'Donell  <carlos@redhat.com>
 
 	* po/de.po: Update from Translation Project.
diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h
index 4cf18a46ccb..06519b9bc54 100644
--- a/elf/get-dynamic-info.h
+++ b/elf/get-dynamic-info.h
@@ -138,9 +138,6 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
 	  || (info[VERSYMIDX (DT_FLAGS_1)]->d_un.d_val & ~DF_1_NOW) == 0);
   assert (info[DT_FLAGS] == NULL
 	  || (info[DT_FLAGS]->d_un.d_val & ~DF_BIND_NOW) == 0);
-  /* Flags must not be set for ld.so.  */
-  assert (info[DT_RUNPATH] == NULL);
-  assert (info[DT_RPATH] == NULL);
 #else
   if (info[DT_FLAGS] != NULL)
     {