From d2f2a3fd9daaab2abf5835c005a6f88a8febfd36 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 22 Jul 2011 23:33:22 -0400 Subject: One more change to XSAVE patch (cherry picked from commit 1aae088a8aa2a4e4211bfe6c0e18100d85f106ae) --- ChangeLog | 6 ++++++ sysdeps/x86_64/dl-trampoline.S | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f698c693b..d654f21edf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-07-22 Ulrich Drepper + + * sysdeps/x86_64/dl-trampoline.S (_dl_runtime_profile): Fix test for + OSXSAVE. + (_dl_x86_64_save_sse): Likewise. + 2011-07-21 Andreas Schwab * 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 ad7479fd29..4aa63ee8d5 100644 --- 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 -- cgit 1.4.1