From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Wed, 4 Oct 2017 10:09:33 +0000 (+0100)
Subject: aarch64: don't use MIN in dl-machine.h
X-Git-Tag: glibc-2.27~743
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db4f87bad48ed93ae14f61121367a7cb94fa46ed;p=thirdparty%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 9a4a0160c45..23f2595bcea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-10-04  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+	* sysdeps/aarch64/dl-machine.h (elf_machine_rela): Expand MIN.
+
 2017-10-04  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #22229]
diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h
index 60472036f57..b1245476dc2 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):