commit 47df8251e8df7570d9581806113723aeb07dc35d

Author: Stefan Liebler <stli@linux.vnet.ibm.com>

Date:   Thu Nov 13 10:44:11 2014 +0100

    S/390: Get rid of warning unused variable in dl-machine.h.

diff --git a/sysdeps/s390/s390-64/dl-machine.h b/sysdeps/s390/s390-64/dl-machine.h

index d08ec8f783729db5..71266a168415d645 100644

--- a/sysdeps/s390/s390-64/dl-machine.h

+++ b/sysdeps/s390/s390-64/dl-machine.h

@@ -299,7 +299,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);