From: H.J. Lu <hjl.tools@gmail.com>
Date: Thu, 21 Jan 2021 19:57:27 +0000 (-0800)
Subject: x86-64: Update tst-glibc-hwcaps-2.c for x86-64 baseline
X-Git-Tag: glibc-2.33~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5432595008a4bf0158b27d90500b2d15fc74482;p=thirdparty%2Fglibc.git

x86-64: Update tst-glibc-hwcaps-2.c for x86-64 baseline

Return EXIT_FAILURE only if the level 2 libx86-64-isa-level.so is used
on x86-64 baseline machine.
---

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 2d8f7ec462e..b2234200894 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;