From: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Date: Thu, 6 Feb 2014 18:10:00 +0000 (-0600)
Subject: Fix assert() remove for DT_RUNPATH and DT_RPATH
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c93dc5f0d2811b971a8cf124818fff22d1c74e52;p=thirdparty%2Fglibc.git

Fix assert() remove for DT_RUNPATH and DT_RPATH

This patch fixes a wrong merge of d19762a5fd946ef86fb2922eb5710aac8000ab25
---

diff --git a/ChangeLog b/ChangeLog
index 01518f87074..7835d363e30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-06  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
+
+	* elf/get-dynamic-info.h (elf_get_dynamic_info): Fix remove of
+	assert.
+
 2014-02-04  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* Versions.def (libm): Add GLIBC_2.3.
diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h
index 1c30c44195c..57cf964f20b 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.  */
-  info[DT_RUNPATH] == NULL;
-  info[DT_RPATH] == NULL;
+  info[DT_RUNPATH] = NULL;
+  info[DT_RPATH] = NULL;
 #else
   if (info[DT_FLAGS] != NULL)
     {