* PING: [PATCH] nios2: Don't use MIN in dl-machine.h
@ 2017-12-08 1:30 H.J. Lu
2017-12-08 11:16 ` Joseph Myers
2017-12-08 11:26 ` H.J. Lu
0 siblings, 2 replies; 3+ messages in thread
From: H.J. Lu @ 2017-12-08 1:30 UTC (permalink / raw)
To: GNU C Library
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: PING: [PATCH] nios2: Don't use MIN in dl-machine.h
2017-12-08 1:30 PING: [PATCH] nios2: Don't use MIN in dl-machine.h H.J. Lu
@ 2017-12-08 11:16 ` Joseph Myers
2017-12-08 11:26 ` H.J. Lu
1 sibling, 0 replies; 3+ messages in thread
From: Joseph Myers @ 2017-12-08 11:16 UTC (permalink / raw)
To: H.J. Lu; +Cc: GNU C Library
I advise CC:ing architecture maintainers on any patch pings.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: PING: [PATCH] nios2: Don't use MIN in dl-machine.h
2017-12-08 1:30 PING: [PATCH] nios2: Don't use MIN in dl-machine.h H.J. Lu
2017-12-08 11:16 ` Joseph Myers
@ 2017-12-08 11:26 ` H.J. Lu
1 sibling, 0 replies; 3+ messages in thread
From: H.J. Lu @ 2017-12-08 11:26 UTC (permalink / raw)
To: GNU C Library, Chung-Lin Tang
On Thu, Dec 7, 2017 at 5:30 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> 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.
>
Hi Chung-Lin,
Is it OK for master?
--
H.J.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-08 11:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-08 1:30 PING: [PATCH] nios2: Don't use MIN in dl-machine.h H.J. Lu
2017-12-08 11:16 ` Joseph Myers
2017-12-08 11:26 ` H.J. Lu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).