diff options
Diffstat (limited to 'elf/dynamic-link.h')
| -rw-r--r-- | elf/dynamic-link.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h index 0229684..f4bbcb5 100644 --- a/elf/dynamic-link.h +++ b/elf/dynamic-link.h @@ -108,24 +108,24 @@ elf_get_dynamic_info (struct link_map *l) if (info[DT_REL] != NULL) assert (info[DT_RELENT]->d_un.d_val == sizeof (ElfW(Rel))); #endif -#ifdef RTLD_BOOTSTRAP - /* None of the flags should be set for the dynamic linker itself. */ - assert (info[DT_FLAGS] == NULL); -#else if (info[DT_FLAGS] != NULL) { /* Flags are used. Translate to the old form where available. Since these l_info entries are only tested for NULL pointers it is ok if they point to the DT_FLAGS entry. */ l->l_flags = info[DT_FLAGS]->d_un.d_val; - if l->l_(flags & DF_SYMBOLIC) +#ifdef RTLD_BOOTSTRAP + /* These three flags must not be set for ld.so. */ + assert ((l->l_flags & (DF_SYMBOLIC | DF_TEXTREL | DF_BIND_NOW)) == 0); +#else + if (l->l_flags & DF_SYMBOLIC) info[DT_SYMBOLIC] = info[DT_FLAGS]; - if l->l_(flags & DF_TEXTREL) + if (l->l_flags & DF_TEXTREL) info[DT_TEXTREL] = info[DT_FLAGS]; if (l->l_flags & DF_BIND_NOW) info[DT_BIND_NOW] = info[DT_FLAGS]; - } #endif + } if (info[VERSYMIDX (DT_FLAGS_1)] != NULL) l->l_flags_1 = info[VERSYMIDX (DT_FLAGS_1)]->d_un.d_val; #ifdef RTLD_BOOTSTRAP |