This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] mips: Don't use MIN in dl-machine.h
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Thu, 30 Nov 2017 14:54:56 -0800
- Subject: [PATCH] mips: Don't use MIN in dl-machine.h
- Authentication-results: sourceware.org; auth=none
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
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?
H.J.
--
* sysdeps/mips/dl-machine.h (elf_machine_reloc): Expand MIN.
---
sysdeps/mips/dl-machine.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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;
}
--
2.14.3