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 9a4a0160c4513d5ba3af1d93bc9434851612dcbd..23f2595bcea2474f2da155f05c3f9a8a577dab45 100644 (file)
--- 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 60472036f5731da425640af23f70c2f3ecc37bd9..b1245476dc26a8fc5b620142d07bfc9b3da9e955 100644 (file)
--- 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):