From: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
Date: Tue, 7 Jan 2014 08:40:00 +0000 (+0100)
Subject: S/390: Get rid of unused variable warning in dl-machine.h
X-Git-Tag: upstream/2.30~8059
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5eebdd084b77b0b581a3aa02213fa7cc5851216;p=external%2Fglibc.git

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

diff --git a/ChangeLog b/ChangeLog
index a8b62e0..bb3786b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-01-07  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
+	* sysdeps/s390/s390-32/dl-machine.h: Gate the definition of refsym
+	also with !RTLD_BOOTSTRAP to get rid of unused variable warning.
+
+2014-01-07  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
 	* sysdeps/s390/Makefile: Build rtld-global-offsets.sym.
 	* sysdeps/s390/rtld-global-offsets.sym: New file.
 	* sysdeps/unix/sysv/linux/s390/Versions: Add getcontext as new
diff --git a/sysdeps/s390/s390-32/dl-machine.h b/sysdeps/s390/s390-32/dl-machine.h
index 100101e..928581e 100644
--- a/sysdeps/s390/s390-32/dl-machine.h
+++ b/sysdeps/s390/s390-32/dl-machine.h
@@ -299,7 +299,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);