Re: [PATCH] i386: Use __glibc_likely/__glibc_likely in dl-machine.h

["Dmitry V. Levin" <ldv at altlinux dot org>]

On Mon, Feb 05, 2018 at 04:28:07AM -0800, H.J. Lu wrote:
> The differences in elf/dl-reloc.os are
> 
> --- before    	2018-02-05 03:53:31.970492246 -0800
> +++ after     	2018-02-05 03:53:49.719902340 -0800
> @@ -1202,9 +1202,9 @@ _dl_relocate_object:
>  	movl	-60(%ebp), %eax
>  	testl	%eax, %eax
>  	je	.L249
> -	movl	8(%eax), %eax
> -	movl	8(%ebx), %esi
> -	cmpl	%esi, %eax
> +	movl	8(%eax), %esi
> +	movl	8(%ebx), %eax
> +	cmpl	%eax, %esi
>  	ja	.L284
>  	jb	.L707
>  .L285:
> @@ -2255,7 +2255,7 @@ _dl_relocate_object:
>  	cmpl	$6, %edi
>  	movl	$4, %edx
>  	je	.L132
> -	cmpl	%ecx, %eax
> +	cmpl	%eax, %ecx
>  	je	.L350
>  	cmpl	$7, %edi
>  	je	.L419
> @@ -2735,7 +2735,7 @@ _dl_relocate_object:
>  	je	.L120
>  .L121:
>  	movl	-96(%ebp), %edx
> -	movl	$640, 8(%esp)
> +	movl	$639, 8(%esp)
>  	leal	__PRETTY_FUNCTION__.9431@GOTOFF(%edx), %eax
>  	movl	%eax, 12(%esp)
>  	leal	.LC9@GOTOFF(%edx), %eax
> @@ -3454,10 +3454,10 @@ _dl_relocate_object:
>  	movl	-152(%ebp), %eax
>  	movl	%eax, 4(%esp)
>  	call	_dl_dprintf
> -	movl	-60(%ebp), %eax
> -	movl	8(%ebx), %esi
> +	movl	8(%ebx), %eax
> +	movl	-60(%ebp), %ebx
>  	movl	-112(%ebp), %edx
> -	movl	8(%eax), %eax
> +	movl	8(%ebx), %esi
>  	jmp	.L285
>  .L713:
>  	movl	%esi, (%esp)
> 
> I will check it in shortly.
> 
> H.J.
> ---
> 	* sysdeps/i386/dl-machine.h (elf_machine_rel): Replace
> 	__builtin_expect with __glibc_likely and __glibc_likely.
> 	(elf_machine_rela): Likewise.
> 	(elf_machine_lazy_rel): Likewise.

Why this patch has been committed without review?

I haven't looked into the change itself, but the commit message and
the changelog entry are very confusing because of
"__glibc_likely/__glibc_likely" and "__glibc_likely and __glibc_likely".


-- 
ldv

Attachment: signature.asc
Description: PGP signature