aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/mips/dl-machine.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f842e7b26..fc0bd3e94b 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 da9d6332ea..904824b908 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;
}