aarch64: don't use MIN in dl-machine.h [committed]

Message ID 59D5119C.3060607@arm.com
State New
Headers show
Series
  • aarch64: don't use MIN in dl-machine.h [committed]
Related show

Commit Message

Szabolcs Nagy Oct. 4, 2017, 4:51 p.m.
MIN is used, but param.h may not be included, so expand its
single use inline.

2017-10-04  Szabolcs Nagy  <szabolcs.nagy@arm.com>

	* sysdeps/aarch64/dl-machine.h (elf_machine_rela): Expand MIN.

Patch

diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h
index 60472036f5..b1245476dc 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):