Message ID | 20171130225456.GA51351@intel.com |
---|---|
State | New |
Headers | show |
Series | mips: Don't use MIN in dl-machine.h | expand |
On Thu, 30 Nov 2017, H.J. Lu wrote: > MIN is used, but param.h may not be included, so expand its single use > inline. > > Tested with build-many-glibcs.py. OK for master? OK.
diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index da9d6332ea..904824b908 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -695,7 +695,8 @@ elf_machine_reloc (struct link_map *map, ElfW(Addr) r_info, RTLD_PROGNAME, strtab + refsym->st_name); } memcpy (reloc_addr, (void *) value, - MIN (sym->st_size, refsym->st_size)); + sym->st_size < refsym->st_size + ? sym->st_size : refsym->st_size); break; }