* [PATCH] nios2: Don't use MIN in dl-machine.h
@ 2017-12-01 18:03 H.J. Lu
0 siblings, 0 replies; only message in thread
From: H.J. Lu @ 2017-12-01 18:03 UTC (permalink / raw)
To: GNU C Library
MIN is used, but param.h may not be included, so expand its single use
inline.
OK for master?
H.J.
---
* sysdeps/nios2/dl-machine.h (elf_machine_rela): Expand MIN.
---
sysdeps/nios2/dl-machine.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sysdeps/nios2/dl-machine.h b/sysdeps/nios2/dl-machine.h
index b5fdd9b2bd..67d8c899a7 100644
--- a/sysdeps/nios2/dl-machine.h
+++ b/sysdeps/nios2/dl-machine.h
@@ -271,7 +271,8 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
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 R_NIOS2_GLOB_DAT:
case R_NIOS2_JUMP_SLOT:
--
2.14.3
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-12-01 18:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-01 18:03 [PATCH] nios2: Don't use MIN in dl-machine.h H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).