* aarch64: don't use MIN in dl-machine.h [committed]
@ 2017-10-04 16:51 Szabolcs Nagy
0 siblings, 0 replies; only message in thread
From: Szabolcs Nagy @ 2017-10-04 16:51 UTC (permalink / raw)
To: GNU C Library; +Cc: nd
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
MIN is used, but param.h may not be included, so expand its
single use inline.
2017-10-04 Szabolcs Nagy <szabolcs.nagy@arm.com>
* sysdeps/aarch64/dl-machine.h (elf_machine_rela): Expand MIN.
[-- Attachment #2: min2.diff --]
[-- Type: text/x-patch, Size: 523 bytes --]
diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h
index 60472036f5..b1245476dc 100644
--- a/sysdeps/aarch64/dl-machine.h
+++ b/sysdeps/aarch64/dl-machine.h
@@ -312,7 +312,8 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
RTLD_PROGNAME, 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 AARCH64_R(RELATIVE):
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-10-04 16:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-04 16:51 aarch64: don't use MIN in dl-machine.h [committed] Szabolcs Nagy
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).