x86-64: Update tst-glibc-hwcaps-2.c for x86-64 baseline
Commit Message
Return EXIT_FAILURE only if the level 2 libx86-64-isa-level.so is used
on x86-64 baseline machine.
---
sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Thu, Jan 21, 2021 at 4:49 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>
> Return EXIT_FAILURE only if the level 2 libx86-64-isa-level.so is used
> on x86-64 baseline machine.
> ---
> sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c b/sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c
> index 2d8f7ec462..b223420089 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c
> +++ b/sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c
> @@ -51,7 +51,7 @@ do_test (void)
> case 2:
> /* The default libx86-64-isa-level.so is used. */
> printf ("The default shared library is used.\n");
> - if (has_isa_v3 || has_isa_v4 || !has_isa_v2)
> + if (has_isa_v3 || has_isa_v4 || (!has_isa_v2 && level == 2))
> ret = EXIT_FAILURE;
> else
> ret = EXIT_SUCCESS;
> --
> 2.29.2
>
I am checking it in.
On 22/01/2021 12:01, H.J. Lu via Libc-alpha wrote:
> On Thu, Jan 21, 2021 at 4:49 PM H.J. Lu <hjl.tools@gmail.com> wrote:
>>
>> Return EXIT_FAILURE only if the level 2 libx86-64-isa-level.so is used
>> on x86-64 baseline machine.
>> ---
>> sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c b/sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c
>> index 2d8f7ec462..b223420089 100644
>> --- a/sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c
>> +++ b/sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c
>> @@ -51,7 +51,7 @@ do_test (void)
>> case 2:
>> /* The default libx86-64-isa-level.so is used. */
>> printf ("The default shared library is used.\n");
>> - if (has_isa_v3 || has_isa_v4 || !has_isa_v2)
>> + if (has_isa_v3 || has_isa_v4 || (!has_isa_v2 && level == 2))
>> ret = EXIT_FAILURE;
>> else
>> ret = EXIT_SUCCESS;
>> --
>> 2.29.2
Ok for 2.33.
@@ -51,7 +51,7 @@ do_test (void)
case 2:
/* The default libx86-64-isa-level.so is used. */
printf ("The default shared library is used.\n");
- if (has_isa_v3 || has_isa_v4 || !has_isa_v2)
+ if (has_isa_v3 || has_isa_v4 || (!has_isa_v2 && level == 2))
ret = EXIT_FAILURE;
else
ret = EXIT_SUCCESS;