Skip to content

_M_ARM64EC cleanups, v3 #1351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
StephanTLavavej wants to merge 1 commit into from
Closed

_M_ARM64EC cleanups, v3 #1351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stl/inc/xutility
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ _STL_DISABLE_CLANG_WARNINGS
#pragma push_macro("new")
#undef new

#if (defined(_M_IX86) || defined(_M_X64) && !defined(_M_ARM64EC)) && !defined(_M_CEE_PURE) && !defined(_M_HYBRID)
#if (defined(_M_IX86) || defined(_M_X64)) && !defined(_M_CEE_PURE) && !defined(_M_HYBRID) && !defined(_M_ARM64EC)
#define _USE_STD_VECTOR_ALGORITHMS 1
#else
#define _USE_STD_VECTOR_ALGORITHMS 0
Expand Down
4 changes: 2 additions & 2 deletions stl/msbuild/stl_atomic_wait/stl_atomic_wait.files.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

<ItemGroup Condition="'$(Arm64X)' == 'true' and '$(TargetNetFx)' != 'true'">
<!-- Add EC symbols to import lib -->
<ImportLib Include="$(ECObjs);" />
<Link Include="$(ECObjs);"/>
<ImportLib Include="$(ECObjs)" />
<Link Include="$(ECObjs)"/>
<Link Condition="'$(CrtBuildModelIsDll)' == 'true'" Include="
$(IntermediateOutputDirectoryEC)\dllmain_satellite.obj;
"/>
Expand Down
10 changes: 5 additions & 5 deletions stl/msbuild/stl_base/msvcp.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

<Import Project="$(MSBuildThisFileDirectory)\stl.files.settings.targets"/>

<!-- Note: semicolons must be included after ".obj"; otherwise msbuild doesn't build it -->
<!-- Note: semicolons must be included after ".obj"; otherwise msbuild doesn't build it. -->
<PropertyGroup>
<ECImportLibObjs>
$(IntermediateOutputDirectoryEC)\_tolower.obj;
Expand Down Expand Up @@ -213,7 +213,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
$(IntermediateOutputDirectoryEC)\xthrow.obj;
$(IntermediateOutputDirectoryEC)\winapisupp.obj;
$(IntermediateOutputDirectoryEC)\dllmain.obj;
$(IntermediateOutputDirectoryEC)\instances.obj
$(IntermediateOutputDirectoryEC)\instances.obj;
</ECImportLibObjs>
<!-- OBJs that need to get added to msvcprt[d].lib and msvcprt_base[d].lib. -->
<!-- They get added to both through msvcprt_base.exp -->
Expand All @@ -223,16 +223,16 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
$(IntermediateOutputDirectoryEC)\nothrow.obj;
$(IntermediateOutputDirectoryEC)\parallel_algorithms.obj;
$(IntermediateOutputDirectoryEC)\sharedmutex.obj;
$(IntermediateOutputDirectoryEC)\vector_algorithms.obj
$(IntermediateOutputDirectoryEC)\vector_algorithms.obj;
</ECLibObjs>
</PropertyGroup>

<!-- OBJs for msvcprt_base.lib -->
<ItemGroup Condition="'$(Arm64X)' == 'true'">
<!-- Add EC symbols to import lib -->
<ImportLib Include="$(ECImportLibObjs);" />
<ImportLib Include="$(ECImportLibObjs)" />
<!-- Add these EC OBJs to import lib -->
<ImportLib Include="$(ECLibObjs);">
<ImportLib Include="$(ECLibObjs)">
<IncludeInLink>false</IncludeInLink>
<IncludeInImportLib>true</IncludeInImportLib>
</ImportLib>
Expand Down
9 changes: 7 additions & 2 deletions stl/src/vector_algorithms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
// injected into the msvcprt.lib and msvcprtd.lib import libraries.
// Do not include or define anything else here.
// In particular, basic_string must not be included here.
#if (defined(_M_IX86) || defined(_M_X64) && !defined(_M_ARM64EC)) && !defined(_M_CEE_PURE)

#ifdef _M_CEE_PURE
#error _M_CEE_PURE should not be defined when compiling vector_algorithms.cpp.
#endif

#if (defined(_M_IX86) || defined(_M_X64)) && !defined(_M_ARM64EC)

#include <emmintrin.h>
#include <immintrin.h>
Expand Down Expand Up @@ -418,4 +423,4 @@ __declspec(noalias) void __cdecl __std_reverse_copy_trivially_copyable_8(

} // extern "C"

#endif // (defined(_M_IX86) || defined(_M_X64) && !defined(_M_ARM64EC)) && !defined(_M_CEE_PURE)
#endif // (defined(_M_IX86) || defined(_M_X64)) && !defined(_M_ARM64EC)