From: H.J. Lu <hjl.tools@gmail.com>
Date: Fri, 1 Dec 2017 00:33:59 +0000 (-0800)
Subject: mips: Don't use MIN in dl-machine.h
X-Git-Tag: glibc-2.27~369
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef5d8b4342dbeeb6b9e67df75c89251898150532;p=thirdparty%2Fglibc.git

mips: 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/mips/dl-machine.h (elf_machine_reloc): Expand MIN.
---

diff --git a/ChangeLog b/ChangeLog
index 9f842e7b269..fc0bd3e94b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/mips/dl-machine.h (elf_machine_reloc): Expand MIN.
+
 2017-11-30  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/m68k/coldfire/fpu/s_fabsf.c: Include
diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h
index da9d6332ea5..904824b9089 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;
       }