From 3fd69b26341e358cfe903313624ad8fd28810a96 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Thu, 6 Aug 2015 16:13:56 -0300 Subject: [PATCH] Remove assert if DT_RUNPATH and DT_RPATH flags are found in ld.so --- ChangeLog | 5 +++++ elf/get-dynamic-info.h | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 82331d58606..63557b2a430 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-08-06 Tulio Magno Quites Machado Filho + + * elf/get-dynamic-info.h (elf_get_dynamic_info): Remove assert + if DT_RUNPATH and DT_RPATH flags are found in ld.so. + 2015-08-05 Zack Weinberg * misc/regexp.h: Update comments. diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h index dc8359d36ac..529ed6c1788 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) { -- 2.47.2