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 9f842e7b269edf25a58c339387b859110c55b388..fc0bd3e94b0389deea7b22e3cfc7ce8fbc2f0b9f 100644 (file)
--- 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 da9d6332ea50dbbb5c7f028bc8119cf43c2c6b71..904824b9089b433f40b111d555cdead4bc23cbe6 100644 (file)
--- 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;
       }