[x86] Disable AVX unless the operating system explicitly claims to support it.

src/x64/assembler-x64.cc

Index: src/x64/assembler-x64.cc
diff --git a/src/x64/assembler-x64.cc b/src/x64/assembler-x64.cc
index 1806d5d639dd10c0b30a4cf273500cb073c0b3b0..3e93cfa9bf04545f59dfffb86cc4540d95152fb2 100644
--- a/src/x64/assembler-x64.cc
+++ b/src/x64/assembler-x64.cc
@@ -13,9 +13,6 @@
 #endif
 
 #include "src/base/bits.h"
-#if V8_OS_WIN
-#include "src/base/win32-headers.h"
-#endif
 #include "src/macro-assembler.h"
 #include "src/v8.h"
 
@@ -27,7 +24,7 @@ namespace internal {
 
 namespace {
 
-bool EnableAVX() {
+bool OSHasAVXSupport() {
 #if V8_OS_MACOSX
   // Mac OS X up to 10.9 has a bug where AVX transitions were indeed being
   // caused by ISRs, so we detect that here and disable AVX in that case.
@@ -44,21 +41,27 @@ bool EnableAVX() {
   *period_pos = '\0';
   long kernel_version_major = strtol(buffer, nullptr, 10);  // NOLINT
   if (kernel_version_major <= 13) return false;
-#elif V8_OS_WIN
-  // The same problem seems to appear on Windows XP and Vista.
-  OSVERSIONINFOEX osvi;
-  DWORDLONG mask = 0;
-  memset(&osvi, 0, sizeof(osvi));
-  osvi.dwOSVersionInfoSize = sizeof(osvi);
-  osvi.dwMajorVersion = 6;
-  osvi.dwMinorVersion = 1;
-  VER_SET_CONDITION(mask, VER_MAJORVERSION, VER_GREATER_EQUAL);
-  VER_SET_CONDITION(mask, VER_MINORVERSION, VER_GREATER_EQUAL);
-  if (!VerifyVersionInfo(&osvi, VER_MAJORVERSION | VER_MINORVERSION, mask)) {
-    return false;
-  }
 #endif  // V8_OS_MACOSX
-  return FLAG_enable_avx;
+  // Check whether OS claims to support AVX.
+  int flags = 0;
+#if V8_CC_GNU
+  // Check xgetbv; this uses a .byte sequence instead of the instruction
+  // directly because older assemblers do not include support for xgetbv and
+  // there is no easy way to conditionally compile based on the assembler used.
+  __asm__ __volatile__(".byte 0x0f, 0x01, 0xd0"
+                       : "=a"(flags)
+                       : "c"(0)
+                       : "%edx");
+#elif V8_CC_MSVC
+  __asm {
+    xor ecx, ecx  // ecx = 0
+    // Use the raw opcode for xgetbv for compatibility with older
+    // toolchains.
+        __asm _emit 0x0f __asm _emit 0x01 __asm _emit 0xd0
+        mov flags, eax
+  }
+#endif
+  return (flags & 6) == 6;
 }
 
 }  // namespace
@@ -76,8 +79,14 @@ void CpuFeatures::ProbeImpl(bool cross_compile) {
   if (cpu.has_sse3() && FLAG_enable_sse3) supported_ |= 1u << SSE3;
   // SAHF is not generally available in long mode.
   if (cpu.has_sahf() && FLAG_enable_sahf) supported_ |= 1u << SAHF;
-  if (cpu.has_avx() && EnableAVX()) supported_ |= 1u << AVX;
-  if (cpu.has_fma3() && FLAG_enable_fma3) supported_ |= 1u << FMA3;
+  if (cpu.has_avx() && FLAG_enable_avx && cpu.has_osxsave() &&
+      OSHasAVXSupport()) {
+    supported_ |= 1u << AVX;
+  }
+  if (cpu.has_fma3() && FLAG_enable_fma3 && cpu.has_osxsave() &&
+      OSHasAVXSupport()) {
+    supported_ |= 1u << FMA3;
+  }
   if (strcmp(FLAG_mcpu, "auto") == 0) {
     if (cpu.is_atom()) supported_ |= 1u << ATOM;
   } else if (strcmp(FLAG_mcpu, "atom") == 0) {