merge branch 3.5

Author: Anselm Kruis

Misc/NEWS

@@ -308,6 +308,8 @@ Build
 Windows
 -------
 
+- Issue #25361: Disables use of SSE2 instructions in Windows 32-bit build
+
 - Issue #25089: Adds logging to installer for case where launcher is not
   selected on upgrade.
 

PCbuild/pyproject.props

@@ -43,6 +43,7 @@
       <CompileAs>Default</CompileAs>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WholeProgramOptimization>true</WholeProgramOptimization>
+      <EnableEnhancedInstructionSet Condition="'$(Platform)'=='Win32'">NoExtensions</EnableEnhancedInstructionSet>
     </ClCompile>
     <ClCompile Condition="$(Configuration) == 'Debug'">
       <Optimization>Disabled</Optimization>

PCbuild/pythoncore.vcxproj.filters

@@ -495,6 +495,9 @@
     <ClInclude Include="..\Modules\hashtable.h">
       <Filter>Modules</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\odictobject.h">
+      <Filter>Include</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Modules\_bisectmodule.c">
@@ -1028,6 +1031,9 @@
     <ClCompile Include="..\PC\invalid_parameter_handler.c">
       <Filter>PC</Filter>
     </ClCompile>
+    <ClCompile Include="..\Objects\odictobject.c">
+      <Filter>Objects</Filter>
+    </ClCompile>
     <ClCompile Include="..\Stackless\core\cframeobject.c">
       <Filter>Stackless\core</Filter>
     </ClCompile>