diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-22 02:56:41 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2014-01-22 02:56:41 +0000 |
| commit | a1055d384d75c28f09a47c2d8628bc330f892955 (patch) | |
| tree | 0608d52a3294ad6f51294acf0cc1b07adf835f30 /libc/sysdeps/s390/s390-32/dl-machine.h | |
| parent | f71e9a28759c1f5d6e8dc0baced440e72507b433 (diff) | |
| download | eglibc2-a1055d384d75c28f09a47c2d8628bc330f892955.tar.gz | |
Merge changes between r24941 and r25087 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@25088 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/s390/s390-32/dl-machine.h')
| -rw-r--r-- | libc/sysdeps/s390/s390-32/dl-machine.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libc/sysdeps/s390/s390-32/dl-machine.h b/libc/sysdeps/s390/s390-32/dl-machine.h index 100101ebe..928581ed4 100644 --- a/libc/sysdeps/s390/s390-32/dl-machine.h +++ b/libc/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); |