From db4f87bad48ed93ae14f61121367a7cb94fa46ed Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Wed, 4 Oct 2017 11:09:33 +0100
Subject: aarch64: 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/aarch64/dl-machine.h (elf_machine_rela): Expand MIN.
---
 sysdeps/aarch64/dl-machine.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sysdeps/aarch64')

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):
-- 
cgit 1.4.1