94084c
commit 5732a881aad24fac876f5505a212395048a7a483
94084c
Author: Florian Weimer <fweimer@redhat.com>
94084c
Date:   Fri Jan 14 16:09:20 2022 +0100
94084c
94084c
    x86: HAVE_X86_LAHF_SAHF, HAVE_X86_MOVBE and -march=x86-64-vN (bug 28782)
94084c
    
94084c
    HAVE_X86_LAHF_SAHF is implied by x86-64-v2, and HAVE_X86_MOVBE by
94084c
    x86-64-v3.
94084c
    
94084c
    The individual flag does not appear in -fverbose-asm flag output
94084c
    even if the ISA level implies it.
94084c
    
94084c
    Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
94084c
94084c
diff --git a/sysdeps/x86/configure b/sysdeps/x86/configure
94084c
index 62676bb686850938..7bdbfdc6dc2ad38f 100644
94084c
--- a/sysdeps/x86/configure
94084c
+++ b/sysdeps/x86/configure
94084c
@@ -155,7 +155,7 @@ else
94084c
   (eval $ac_try) 2>&5
94084c
   ac_status=$?
94084c
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
94084c
-  test $ac_status = 0; }; } | grep -q "\-msahf"; then
94084c
+  test $ac_status = 0; }; } | grep -qE '(-msahf\b|-march=x86-64-v)'; then
94084c
       libc_cv_have_x86_lahf_sahf=yes
94084c
     fi
94084c
 fi
94084c
@@ -176,7 +176,7 @@ else
94084c
   (eval $ac_try) 2>&5
94084c
   ac_status=$?
94084c
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
94084c
-  test $ac_status = 0; }; } | grep -q "\-mmovbe"; then
94084c
+  test $ac_status = 0; }; } | grep -qE '(-mmovbe\b|-march=x86-64-v([3-9]|[1-9][0-9]))'; then
94084c
       libc_cv_have_x86_movbe=yes
94084c
     fi
94084c
 fi
94084c
diff --git a/sysdeps/x86/configure.ac b/sysdeps/x86/configure.ac
94084c
index 04a12ab68048cd66..10d5c2e0e555fc79 100644
94084c
--- a/sysdeps/x86/configure.ac
94084c
+++ b/sysdeps/x86/configure.ac
94084c
@@ -110,7 +110,7 @@ if test $libc_cv_include_x86_isa_level = yes; then
94084c
   AC_CACHE_CHECK([for LAHF/SAHF instruction support],
94084c
 		 libc_cv_have_x86_lahf_sahf, [dnl
94084c
     libc_cv_have_x86_lahf_sahf=no
94084c
-    if AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -fverbose-asm -S -o - -x c /dev/null) | grep -q "\-msahf"; then
94084c
+    if AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -fverbose-asm -S -o - -x c /dev/null) | grep -qE '(-msahf\b|-march=x86-64-v)'; then
94084c
       libc_cv_have_x86_lahf_sahf=yes
94084c
     fi])
94084c
   if test $libc_cv_have_x86_lahf_sahf = yes; then
94084c
@@ -119,7 +119,7 @@ if test $libc_cv_include_x86_isa_level = yes; then
94084c
   AC_CACHE_CHECK([for MOVBE instruction support],
94084c
 		 libc_cv_have_x86_movbe, [dnl
94084c
     libc_cv_have_x86_movbe=no
94084c
-    if AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -fverbose-asm -S -o - -x c /dev/null) | grep -q "\-mmovbe"; then
94084c
+    if AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS -fverbose-asm -S -o - -x c /dev/null) | grep -qE '(-mmovbe\b|-march=x86-64-v(@<:@3-9@:>@|@<:@1-9@:>@@<:@0-9@:>@))'; then
94084c
       libc_cv_have_x86_movbe=yes
94084c
     fi])
94084c
   if test $libc_cv_have_x86_movbe = yes; then