From ef5d8b4342dbeeb6b9e67df75c89251898150532 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 30 Nov 2017 16:33:59 -0800 Subject: mips: 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/mips/dl-machine.h (elf_machine_reloc): Expand MIN. --- sysdeps/mips/dl-machine.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sysdeps/mips') 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; } -- cgit v1.2.1