diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/dl-machine.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index a6711e194b..6648967a71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2014-11-13 Stefan Liebler <stli@linux.vnet.ibm.com> + * sysdeps/s390/s390-64/dl-machine.h (elf_machine_rela): + Gate the definition of refsym additionally with !RTLD_BOOTSTRAP + to get rid of unused variable warning. + +2014-11-13 Stefan Liebler <stli@linux.vnet.ibm.com> + * sysdeps/s390/s390-32/backtrace.c (__backtrace): Check for unwind_backtrace == NULL only in SHARED case. (__backchain_backtrace): Compile only in SHARED case. diff --git a/sysdeps/s390/s390-64/dl-machine.h b/sysdeps/s390/s390-64/dl-machine.h index 463021c6a4..01c0d33832 100644 --- a/sysdeps/s390/s390-64/dl-machine.h +++ b/sysdeps/s390/s390-64/dl-machine.h @@ -278,7 +278,8 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, return; else { -#ifndef RESOLVE_CONFLICT_FIND_MAP +#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP + /* Only needed for R_390_COPY below. */ const Elf64_Sym *const refsym = sym; #endif struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type); |