OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Szabolcs Nagy 2017-10-04 11:09:33 +01:00
parent 32d372d548
commit db4f87bad4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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]

3
sysdeps/aarch64/dl-machine.h
View File

@ -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):