[PATCH] x86-64: Use __glibc_likely/__glibc_likely in dl-machine.h

[H.J. Lu]

On Fri, Feb 2, 2018 at 9:42 AM, H.J. Lu <hongjiu.lu@intel.com> wrote:
> OK for master?
>
> H.J.
> ---
>         * sysdeps/x86_64/dl-machine.h (elf_machine_rela): Replace
>         __builtin_expect with __glibc_likely and __glibc_likely.
>         (elf_machine_lazy_rel): Likewise.
> ---
>  sysdeps/x86_64/dl-machine.h | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
> index f525600071..5d45ca5342 100644
> --- a/sysdeps/x86_64/dl-machine.h
> +++ b/sysdeps/x86_64/dl-machine.h
> @@ -310,10 +310,9 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
>                           : (ElfW(Addr)) sym_map->l_addr + sym->st_value);
>
>        if (sym != NULL
> -         && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC,
> -                              0)
> -         && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1)
> -         && __builtin_expect (!skip_ifunc, 1))
> +         && __glibc_unlikely (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC)
> +         && __glibc_likely (sym->st_shndx != SHN_UNDEF)
> +         && __glibc_likely (!skip_ifunc))
>         {
>  # ifndef RTLD_BOOTSTRAP
>           if (sym_map != map
> @@ -500,8 +499,8 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
>             break;
>           memcpy (reloc_addr_arg, (void *) value,
>                   MIN (sym->st_size, refsym->st_size));
> -         if (__builtin_expect (sym->st_size > refsym->st_size, 0)
> -             || (__builtin_expect (sym->st_size < refsym->st_size, 0)
> +         if (__glibc_unlikely (sym->st_size > refsym->st_size)
> +             || (__glibc_unlikely (sym->st_size < refsym->st_size)
>                   && GLRO(dl_verbose)))
>             {
>               fmt = "\
> @@ -554,7 +553,8 @@ elf_machine_lazy_rel (struct link_map *map,
>    /* Check for unexpected PLT reloc type.  */
>    if (__glibc_likely (r_type == R_X86_64_JUMP_SLOT))
>      {
> -      if (__builtin_expect (map->l_mach.plt, 0) == 0)
> +      /* Prelinked has been deprecated.  */
> +      if (__glibc_likely (map->l_mach.plt == 0))
>         *reloc_addr += l_addr;
>        else
>         *reloc_addr =
> --
> 2.14.3
>

This is what I am checking in.


-- 
H.J.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-x86-64-Use-__glibc_likely-__glibc_likely-in-dl-machi.patch
Type: text/x-patch
Size: 2456 bytes
Desc: not available
URL: <http://sourceware.org/pipermail/libc-alpha/attachments/20180205/e46b5e79/attachment.bin>