qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Stefan Liebler 2014-11-13 10:44:11 +01:00 committed by Andreas Krebbel
parent 618cebeff8
commit 47df8251e8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
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> 2014-11-13 Stefan Liebler <stli@linux.vnet.ibm.com>
* sysdeps/s390/s390-32/backtrace.c (__backtrace): * sysdeps/s390/s390-32/backtrace.c (__backtrace):

3
sysdeps/s390/s390-64/dl-machine.h
View File

@ -278,7 +278,8 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
return; return;
else 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; const Elf64_Sym *const refsym = sym;
#endif #endif
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type); struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);