Patchwork nios2: Don't use MIN in dl-machine.h

login
register
mail settings
Submitter H.J. Lu
Date Dec. 1, 2017, 6:03 p.m.
Message ID <20171201180307.GA8255@gmail.com>
Download mbox | patch
Permalink /patch/24678/
State New
Headers show

Comments

H.J. Lu - Dec. 1, 2017, 6:03 p.m.
MIN is used, but param.h may not be included, so expand its single use
inline.

OK for master?

H.J.
---
	* sysdeps/nios2/dl-machine.h (elf_machine_rela): Expand MIN.
---
 sysdeps/nios2/dl-machine.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

diff --git a/sysdeps/nios2/dl-machine.h b/sysdeps/nios2/dl-machine.h
index b5fdd9b2bd..67d8c899a7 100644
--- a/sysdeps/nios2/dl-machine.h
+++ b/sysdeps/nios2/dl-machine.h
@@ -271,7 +271,8 @@  elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
 				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 R_NIOS2_GLOB_DAT:
 	case R_NIOS2_JUMP_SLOT: