Fix assert() remove for DT_RUNPATH and DT_RPATH

This patch fixes a wrong merge of d19762a5fd946ef86fb2922eb5710aac8000ab25

diff --git a/ChangeLog b/ChangeLog
index 01518f870748f307b062fffca4180d1bd35de4ce..7835d363e308a699c9fc8847c726054e24744ff3 100644 (file)
--- 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 1c30c44195c3afed6a553fa15cedaebf3a9906cf..57cf964f20b6b2ad6b57691f26d34712360964dc 100644 (file)
--- 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)
     {