Fix AVX check

(cherry picked from commit 1d002f25399c0a0ed2cc276d4ee18db869152384)

diff --git a/ChangeLog b/ChangeLog
index 9b130a5cd7c5a31705bcb034f7cedc1750f75c0b..6f698c693b24f6bc834e660e8222b69d6972dc29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-21  Andreas Schwab  <schwab@redhat.com>
+
+       * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Fix last
+       change.
+       (_dl_x86_64_save_sse): Use correct AVX check.
+
 2011-07-20  Ulrich Drepper  <drepper@gmail.com>
 
        [BZ #13007]

diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S
index 1b97929aaa159adf92a3f7344444145bf7cb5c76..ad7479fd29e1b0375500b4ac49587aff544b26ca 100644 (file)
--- a/sysdeps/x86_64/dl-trampoline.S
+++ b/sysdeps/x86_64/dl-trampoline.S
@@ -150,7 +150,8 @@ L(have_avx):
        cmpl    $0x6, %eax
        // Nonzero if SSE and AVX state saving is enabled.
        sete    %al
-2:     movl    %eax, L(have_avx)(%rip)
+2:     leal    -1(%eax,%eax), %eax
+       movl    %eax, L(have_avx)(%rip)
        cmpl    $0, %eax
 
 1:     js      L(no_avx)
@@ -183,11 +184,19 @@ _dl_x86_64_save_sse:
        movl    $1, %eax
        cpuid
        movq    %r11,%rbx               # Restore rbx
-       movl    $1, %eax
-       testl   $(1 << 28), %ecx
-       jne     2f
-       negl    %eax
-2:     movl    %eax, L(have_avx)(%rip)
+       xorl    %eax, %eax
+       // AVX and XSAVE supported?
+       testl   $((1 << 28) | (1 << 27)), %ecx
+       je      2f
+       xorl    %ecx, %ecx
+       // Get XFEATURE_ENABLED_MASK
+       xgetbv
+       andl    $0x6, %eax
+       cmpl    $0x6, %eax
+       // Nonzero if SSE and AVX state saving is enabled.
+       sete    %al
+2:     leal    -1(%eax,%eax), %eax
+       movl    %eax, L(have_avx)(%rip)
        cmpl    $0, %eax
 
 1:     js      L(no_avx5)