diff --git a/CMakeLists.txt b/CMakeLists.txt index 5eb09a74e8..38b443326e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,6 @@ if("${VCLIBS_TARGET_ARCHITECTURE}" STREQUAL "x86") # Note that we set _WIN32_WINNT to a high level to make declarations available, but still engage downlevel # runtime dynamic linking by setting our own _STL_WIN32_WINNT back to Windows XP. add_compile_definitions(_X86_ _VCRT_WIN32_WINNT=0x0501 _STL_WIN32_WINNT=0x0501) - add_compile_options($<$:/arch:IA32>) elseif(VCLIBS_TARGET_ARCHITECTURE STREQUAL "x64") set(VCLIBS_TARGET_ARCHITECTURE "x64") set(VCLIBS_I386_OR_AMD64 "amd64") diff --git a/tests/std/tests/GH_002431_byte_range_find_with_unreachable_sentinel/test.cpp b/tests/std/tests/GH_002431_byte_range_find_with_unreachable_sentinel/test.cpp index 4bbf13a56d..4a3c7fe556 100644 --- a/tests/std/tests/GH_002431_byte_range_find_with_unreachable_sentinel/test.cpp +++ b/tests/std/tests/GH_002431_byte_range_find_with_unreachable_sentinel/test.cpp @@ -65,10 +65,6 @@ int main() { disable_instructions(__ISA_AVAILABLE_SSE42); test_all_element_sizes(p, page); #endif // defined(_M_IX86) || defined(_M_X64) -#if defined(_M_IX86) - disable_instructions(__ISA_AVAILABLE_SSE2); - test_all_element_sizes(p, page); -#endif // defined(_M_IX86) VirtualFree(p, 0, MEM_RELEASE); } diff --git a/tests/std/tests/VSO_0000000_vector_algorithms/test.cpp b/tests/std/tests/VSO_0000000_vector_algorithms/test.cpp index 5f81721806..5a7a152041 100644 --- a/tests/std/tests/VSO_0000000_vector_algorithms/test.cpp +++ b/tests/std/tests/VSO_0000000_vector_algorithms/test.cpp @@ -1180,11 +1180,5 @@ int main() { test_various_containers(); test_bitset(gen); #endif // defined(_M_IX86) || defined(_M_X64) -#if defined(_M_IX86) - disable_instructions(__ISA_AVAILABLE_SSE2); - test_vector_algorithms(gen); - test_various_containers(); - test_bitset(gen); -#endif // defined(_M_IX86) #endif // _M_CEE_PURE } diff --git a/tests/std/tests/floating_point_model_matrix.lst b/tests/std/tests/floating_point_model_matrix.lst index cca86c70c4..7df38b8484 100644 --- a/tests/std/tests/floating_point_model_matrix.lst +++ b/tests/std/tests/floating_point_model_matrix.lst @@ -6,7 +6,6 @@ RUNALL_CROSSLIST * PM_CL="/FIfenv_prefix.hpp /w14640 /Zc:threadSafeInit- /EHsc /std:c++latest" RUNALL_CROSSLIST * PM_CL="" -* PM_CL="/arch:IA32" * PM_CL="/arch:AVX2" * PM_CL="/arch:VFPv4" RUNALL_CROSSLIST diff --git a/tests/utils/stl/test/features.py b/tests/utils/stl/test/features.py index c26e6697fe..36e4cd70cd 100644 --- a/tests/utils/stl/test/features.py +++ b/tests/utils/stl/test/features.py @@ -50,7 +50,6 @@ def getDefaultFeatures(config, litConfig): DEFAULT_FEATURES.append(Feature(name='edg_drop')) if litConfig.target_arch.casefold() == 'x86'.casefold(): - DEFAULT_FEATURES.append(Feature(name='arch_ia32')) DEFAULT_FEATURES.append(Feature(name='arch_avx2')) DEFAULT_FEATURES.append(Feature(name='x86')) diff --git a/tests/utils/stl/test/tests.py b/tests/utils/stl/test/tests.py index b932c336fc..7217d49bab 100644 --- a/tests/utils/stl/test/tests.py +++ b/tests/utils/stl/test/tests.py @@ -290,8 +290,6 @@ def _parseFlags(self, litConfig): self.requires.append('edg') # available for x64, see features.py elif flag[1:] == 'arch:AVX2': self.requires.append('arch_avx2') # available for x86 and x64, see features.py - elif flag[1:] == 'arch:IA32': - self.requires.append('arch_ia32') # available for x86, see features.py elif flag[1:] == 'arch:VFPv4': self.requires.append('arch_vfpv4') # available for arm, see features.py elif flag[1:] == 'MDd':