From c93dc5f0d2811b971a8cf124818fff22d1c74e52 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 6 Feb 2014 12:10:00 -0600 Subject: Fix assert() remove for DT_RUNPATH and DT_RPATH This patch fixes a wrong merge of d19762a5fd946ef86fb2922eb5710aac8000ab25 --- ChangeLog | 5 +++++ elf/get-dynamic-info.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01518f8707..7835d363e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-02-06 Adhemerval Zanella + + * elf/get-dynamic-info.h (elf_get_dynamic_info): Fix remove of + assert. + 2014-02-04 Adhemerval Zanella * Versions.def (libm): Add GLIBC_2.3. diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h index 1c30c44195..57cf964f20 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) { -- cgit 1.4.1