diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2017-10-04 11:09:33 +0100 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2017-10-04 17:49:38 +0100 |
| commit | db4f87bad48ed93ae14f61121367a7cb94fa46ed (patch) | |
| tree | 09667b243c01cd93c4e758904fbda4756b50b3fe | |
| parent | 32d372d548122b224ec63a520a780d9227094a48 (diff) | |
| download | glibc-db4f87bad48ed93ae14f61121367a7cb94fa46ed.tar.gz glibc-db4f87bad48ed93ae14f61121367a7cb94fa46ed.tar.xz glibc-db4f87bad48ed93ae14f61121367a7cb94fa46ed.zip | |
aarch64: don't use MIN in dl-machine.h
MIN is used, but param.h may not be included, so expand its single use inline. * sysdeps/aarch64/dl-machine.h (elf_machine_rela): Expand MIN.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/aarch64/dl-machine.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 9a4a0160c4..23f2595bce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-10-04 Szabolcs Nagy <szabolcs.nagy@arm.com> + + * sysdeps/aarch64/dl-machine.h (elf_machine_rela): Expand MIN. + 2017-10-04 Joseph Myers <joseph@codesourcery.com> [BZ #22229] diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h index 60472036f5..b1245476dc 100644 --- a/sysdeps/aarch64/dl-machine.h +++ b/sysdeps/aarch64/dl-machine.h @@ -312,7 +312,8 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, RTLD_PROGNAME, strtab + refsym->st_name); } memcpy (reloc_addr_arg, (void *) value, - MIN (sym->st_size, refsym->st_size)); + sym->st_size < refsym->st_size + ? sym->st_size : refsym->st_size); break; case AARCH64_R(RELATIVE): |