This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
PING: [PATCH] nios2: Don't use MIN in dl-machine.h
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Thu, 7 Dec 2017 17:30:10 -0800
- Subject: PING: [PATCH] nios2: Don't use MIN in dl-machine.h
- Authentication-results: sourceware.org; auth=none
On Fri, Dec 1, 2017 at 10:03 AM, H.J. Lu <hongjiu.lu@intel.com> wrote:
> 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(-)
>
> 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:
> --
> 2.14.3
>
PING.
--
H.J.