One more change to XSAVE patch

(cherry picked from commit 1aae088a8aa2a4e4211bfe6c0e18100d85f106ae)

diff --git a/ChangeLog b/ChangeLog
index 6f698c693b24f6bc834e660e8222b69d6972dc29..d654f21edfd1e56f46efa8b9a525dbe6bdb825dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-22  Ulrich Drepper  <drepper@gmail.com>
+
+       * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Fix test for
+       OSXSAVE.
+       (_dl_x86_64_save_sse): Likewise.
+
 2011-07-21  Andreas Schwab  <schwab@redhat.com>
 
        * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Fix last

diff --git a/sysdeps/x86_64/dl-trampoline.S b/sysdeps/x86_64/dl-trampoline.S
index ad7479fd29e1b0375500b4ac49587aff544b26ca..4aa63ee8d57567fbf12dc4576497943242a14054 100644 (file)
--- a/sysdeps/x86_64/dl-trampoline.S
+++ b/sysdeps/x86_64/dl-trampoline.S
@@ -141,7 +141,8 @@ L(have_avx):
        movq    %r11,%rbx               # Restore rbx
        xorl    %eax, %eax
        // AVX and XSAVE supported?
-       testl   $((1 << 28) | (1 << 27)), %ecx
+       andl    $((1 << 28) | (1 << 27)), %ecx
+       cmpl    $((1 << 28) | (1 << 27)), %ecx
        je      2f
        xorl    %ecx, %ecx
        // Get XFEATURE_ENABLED_MASK
@@ -186,7 +187,8 @@ _dl_x86_64_save_sse:
        movq    %r11,%rbx               # Restore rbx
        xorl    %eax, %eax
        // AVX and XSAVE supported?
-       testl   $((1 << 28) | (1 << 27)), %ecx
+       andl    $((1 << 28) | (1 << 27)), %ecx
+       cmpl    $((1 << 28) | (1 << 27)), %ecx
        je      2f
        xorl    %ecx, %ecx
        // Get XFEATURE_ENABLED_MASK