diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/sh/dl-machine.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 0aedae84ff..9ccb1a34cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-03-12 Alexey Neyman <stilor@att.net> + + * sysdeps/sh/dl-machine.h (elf_machine_rela): The condition + in R_SH_DIR32 case is always false when inlined from + dl-conflict.c. Ifdef out to prevent GCC from insertin an + 2016-03-12 Marko Myllynen <myllynen@redhat.com> * sysdeps/unix/sysv/linux/alpha/kernel-features.h diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h index 449deea6fe..2b468af6fa 100644 --- a/sysdeps/sh/dl-machine.h +++ b/sysdeps/sh/dl-machine.h @@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, break; case R_SH_DIR32: { -#ifndef RTLD_BOOTSTRAP +#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP /* This is defined in rtld.c, but nowhere in the static libc.a; make the reference weak so static programs can still link. This declaration cannot be done when |