commit c5eebdd084b77b0b581a3aa02213fa7cc5851216

Author: Andreas Krebbel <krebbel@linux.vnet.ibm.com>

Date:   Tue Jan 7 09:40:00 2014 +0100

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

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

index febd99f8c6013f29..d2f57e6bbe13ec9d 100644

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

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

@@ -354,7 +354,8 @@ elf_machine_rela (struct link_map *map, const Elf32_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 Elf32_Sym *const refsym = sym;

 #endif

       struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);