16 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 4aac54222..593366acd 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -25,6 +25,8 @@ from .compilers import (
     msvc_buildtype_args,
     msvc_buildtype_linker_args,
     msvc_winlibs,
+    vs32_instruction_set_args,
+    vs64_instruction_set_args,
     ClangCompiler,
     Compiler,
     CompilerArgs,
diff --git a/mesonbuild/modules/simd.py b/mesonbuild/modules/simd.py
index b666f4bbe..12d9839a6 100644
--- a/mesonbuild/modules/simd.py
+++ b/mesonbuild/modules/simd.py
@@ -44,7 +44,7 @@ class SimdModule(ExtensionModule):
         if 'compiler' not in kwargs:
             raise mesonlib.MesonException('Must specify compiler keyword')
         compiler = kwargs['compiler'].compiler
-        if not isinstance(compiler, compilers.Compiler):
+        if not isinstance(compiler, compilers.compilers.Compiler):
             raise mesonlib.MesonException('Compiler argument must be a compiler object.')
         cdata = interpreter.func_configuration_data(None, [], {})
         conf = cdata.held_object
diff --git a/test cases/common/153 simd/fallback.c b/test cases/common/155 simd/fallback.c
index ab435f433..ab435f433 100644
--- a/test cases/common/153 simd/fallback.c
+++ b/test cases/common/155 simd/fallback.c
diff --git a/test cases/common/153 simd/meson.build b/test cases/common/155 simd/meson.build
index d84b72248..d84b72248 100644
--- a/test cases/common/153 simd/meson.build
+++ b/test cases/common/155 simd/meson.build
diff --git a/test cases/common/153 simd/simd_avx.c b/test cases/common/155 simd/simd_avx.c
index 989620ba3..989620ba3 100644
--- a/test cases/common/153 simd/simd_avx.c
+++ b/test cases/common/155 simd/simd_avx.c
diff --git a/test cases/common/153 simd/simd_avx2.c b/test cases/common/155 simd/simd_avx2.c
index 15297eb2b..15297eb2b 100644
--- a/test cases/common/153 simd/simd_avx2.c
+++ b/test cases/common/155 simd/simd_avx2.c
diff --git a/test cases/common/153 simd/simd_mmx.c b/test cases/common/155 simd/simd_mmx.c
index 731abd14a..731abd14a 100644
--- a/test cases/common/153 simd/simd_mmx.c
+++ b/test cases/common/155 simd/simd_mmx.c
diff --git a/test cases/common/153 simd/simd_neon.c b/test cases/common/155 simd/simd_neon.c
index 20820992b..20820992b 100644
--- a/test cases/common/153 simd/simd_neon.c
+++ b/test cases/common/155 simd/simd_neon.c
diff --git a/test cases/common/153 simd/simd_sse.c b/test cases/common/155 simd/simd_sse.c
index 3c9fe622e..3c9fe622e 100644
--- a/test cases/common/153 simd/simd_sse.c
+++ b/test cases/common/155 simd/simd_sse.c
diff --git a/test cases/common/153 simd/simd_sse2.c b/test cases/common/155 simd/simd_sse2.c
index 02745337b..02745337b 100644
--- a/test cases/common/153 simd/simd_sse2.c
+++ b/test cases/common/155 simd/simd_sse2.c
diff --git a/test cases/common/153 simd/simd_sse3.c b/test cases/common/155 simd/simd_sse3.c
index e97d10285..e97d10285 100644
--- a/test cases/common/153 simd/simd_sse3.c
+++ b/test cases/common/155 simd/simd_sse3.c
diff --git a/test cases/common/153 simd/simd_sse41.c b/test cases/common/155 simd/simd_sse41.c
index 0308c7e49..0308c7e49 100644
--- a/test cases/common/153 simd/simd_sse41.c
+++ b/test cases/common/155 simd/simd_sse41.c
diff --git a/test cases/common/153 simd/simd_sse42.c b/test cases/common/155 simd/simd_sse42.c
index 137ffc441..137ffc441 100644
--- a/test cases/common/153 simd/simd_sse42.c
+++ b/test cases/common/155 simd/simd_sse42.c
diff --git a/test cases/common/153 simd/simd_ssse3.c b/test cases/common/155 simd/simd_ssse3.c
index ab4dff4f8..ab4dff4f8 100644
--- a/test cases/common/153 simd/simd_ssse3.c
+++ b/test cases/common/155 simd/simd_ssse3.c
diff --git a/test cases/common/153 simd/simdchecker.c b/test cases/common/155 simd/simdchecker.c
index 222fbf3e3..222fbf3e3 100644
--- a/test cases/common/153 simd/simdchecker.c
+++ b/test cases/common/155 simd/simdchecker.c
diff --git a/test cases/common/153 simd/simdfuncs.h b/test cases/common/155 simd/simdfuncs.h
index dfb056068..dfb056068 100644
--- a/test cases/common/153 simd/simdfuncs.h
+++ b/test cases/common/155 simd/simdfuncs.h