summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Krebbel <krebbel@linux.vnet.ibm.com>2014-01-07 09:40:00 +0100
committerAndreas Krebbel <krebbel@linux.vnet.ibm.com>2014-01-07 09:42:23 +0100
commitc5eebdd084b77b0b581a3aa02213fa7cc5851216 (patch)
tree41c260848359dac6e0aaaf0029882132579bff06
parent05d138ef07481b16f1aaee648798cc51182ec65e (diff)
downloadglibc-c5eebdd084b77b0b581a3aa02213fa7cc5851216.tar.gz
glibc-c5eebdd084b77b0b581a3aa02213fa7cc5851216.tar.xz
glibc-c5eebdd084b77b0b581a3aa02213fa7cc5851216.zip
S/390: Get rid of unused variable warning in dl-machine.h
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/s390/s390-32/dl-machine.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a8b62e0a0e..bb3786b69d 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 100101ebe9..928581ed49 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);