* [PATCH] mips: Don't use MIN in dl-machine.h
@ 2017-11-30 22:55 H.J. Lu
2017-11-30 23:41 ` Joseph Myers
0 siblings, 1 reply; 2+ messages in thread
From: H.J. Lu @ 2017-11-30 22:55 UTC (permalink / raw)
To: GNU C Library
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] mips: Don't use MIN in dl-machine.h
2017-11-30 22:55 [PATCH] mips: Don't use MIN in dl-machine.h H.J. Lu
@ 2017-11-30 23:41 ` Joseph Myers
0 siblings, 0 replies; 2+ messages in thread
From: Joseph Myers @ 2017-11-30 23:41 UTC (permalink / raw)
To: H.J. Lu; +Cc: GNU C Library
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.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-11-30 23:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-30 22:55 [PATCH] mips: Don't use MIN in dl-machine.h H.J. Lu
2017-11-30 23:41 ` Joseph Myers
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).