From: Ryan S. Arnold <rsa@linux.vnet.ibm.com>
Date: Fri, 15 Nov 2013 13:42:33 +0000 (-0600)
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=fbed4f13980bf4ebd7df59b0e52bd2a16875f0db;p=thirdparty%2Fglibc.git

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

diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h
index 20ccf30b2ac..7f51d90dbc5 100644
--- a/elf/get-dynamic-info.h
+++ b/elf/get-dynamic-info.h
@@ -130,8 +130,8 @@ 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);
   /* Flags must not be set for ld.so.  */
-  assert (info[DT_RUNPATH] == NULL);
-  assert (info[DT_RPATH] == NULL);
+  info[DT_RUNPATH] == NULL;
+  info[DT_RPATH] == NULL;
 #else
   if (info[DT_FLAGS] != NULL)
     {