summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2014-05-22 20:43:55 +0100
committerJosé Fonseca <jfonseca@vmware.com>2014-05-22 22:39:46 +0100
commitcfec135de7f604ffe14f7a7a78157697911519ec (patch)
treeeb3b69eda1b4b4ca0d6a4b47df3f5636edd0067b /src/mesa/main
parentc59c8f036399fb90cbd148feac7a4bde187ecf9b (diff)
mesa: Rely on USE_X86_64_ASM.
This fixes MinGW x64 builds. We don't use assembly on any of the Windows builds, to avoid divergence between MSVC and MinGW when testing. Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/cpuinfo.c2
-rw-r--r--src/mesa/main/cpuinfo.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/cpuinfo.c b/src/mesa/main/cpuinfo.c
index 73e295c75b7..0755d6b21eb 100644
--- a/src/mesa/main/cpuinfo.c
+++ b/src/mesa/main/cpuinfo.c
@@ -34,7 +34,7 @@
void
_mesa_get_cpu_features(void)
{
-#if defined USE_X86_ASM || (defined __x86_64__ && !defined _MSC_VER)
+#if defined USE_X86_ASM || defined USE_X86_64_ASM
_mesa_get_x86_features();
#endif
}
diff --git a/src/mesa/main/cpuinfo.h b/src/mesa/main/cpuinfo.h
index fcd611e42e7..57925e82bf2 100644
--- a/src/mesa/main/cpuinfo.h
+++ b/src/mesa/main/cpuinfo.h
@@ -27,7 +27,7 @@
#define CPUINFO_H
-#if defined USE_X86_ASM || (defined __x86_64__ && !defined _MSC_VER)
+#if defined USE_X86_ASM || defined USE_X86_64_ASM
#include "x86/common_x86_asm.h"
#endif