Skip to content

Commit 51ccd93

Browse files
StephanTLavavejStephanTLavavej
authored
Port MSVC-internal changes, again (microsoft#1431)
1 parent f873f51 commit 51ccd93

13 files changed

Lines changed: 21 additions & 332 deletions

‎stl/aliases/arm64ec/std_init_once_begin_initialize.obj‎

113 Bytes
Binary file not shown.

‎stl/aliases/arm64ec/std_init_once_complete.obj‎

98 Bytes
Binary file not shown.

‎stl/aliases/generate.cmd‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ mkdir arm64ec
4444
chpe\std_init_once_begin_initialize.obj
4545
..\..\..\..\..\tools\amd64\aliasobj.exe ^
4646
/machine:arm64ec ^
47-
__imp___std_init_once_begin_initialize ^
48-
__imp_InitOnceBeginInitialize ^
47+
-m std_init_once_begin_initialize-arm64ec.txt ^
4948
arm64ec\std_init_once_begin_initialize.obj
5049

5150
:: __std_init_once_complete
@@ -72,6 +71,5 @@ mkdir arm64ec
7271
chpe\std_init_once_complete.obj
7372
..\..\..\..\..\tools\amd64\aliasobj.exe ^
7473
/machine:arm64ec ^
75-
__imp___std_init_once_complete ^
76-
__imp_InitOnceComplete ^
74+
-m std_init_once_complete-arm64ec.txt ^
7775
arm64ec\std_init_once_complete.obj

‎stl/aliases/std_init_once_begin_initialize-arm64ec.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#__std_init_once_begin_initialize #InitOnceBeginInitialize
2+
__imp___std_init_once_begin_initialize __imp_InitOnceBeginInitialize

‎stl/aliases/std_init_once_complete-arm64ec.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#__std_init_once_complete #InitOnceComplete
2+
__imp___std_init_once_complete __imp_InitOnceComplete

‎stl/msbuild/stl_1/stl_1.files.settings.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
1111
">
1212
<BuildAs>nativecpp</BuildAs>
1313
</BuildFiles>
14-
<Link Condition="'$(Arm64X)' == 'true'" Include="$(IntermediateOutputDirectoryEC)\memory_resource.obj;"/>
1514
<BuildFiles Condition="'$(CrtBuildModelIsDll)' == 'true'" Include="
1615
$(CrtRoot)\github\stl\src\dllmain_satellite.cpp;
1716
">

‎stl/msbuild/stl_2/msvcp_2.settings.targets‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
3636
<IntermediateImportLibOutput>$(CrtBuildDir)\msvcprt_2$(BuildSuffix).$(MsvcpFlavor).import_only.lib</IntermediateImportLibOutput>
3737
<DllDefName>$(LibOutputFileName).$(MsvcpFlavor)</DllDefName>
3838
<DllDef>$(IntermediateOutputDirectory)\$(DllDefName).def</DllDef>
39-
<DllDef Condition="'$(Arm64X)' == 'true'">$(IntermediateOutputDirectoryEC)\$(DllDefName).def</DllDef>
40-
<DllDefArm64Native Condition="'$(Arm64X)' == 'true'">$(IntermediateOutputDirectory)\$(DllDefName).def</DllDefArm64Native>
4139

4240
<LinkGenerateDebugInformation Condition="'$(BLD_REL_NO_DBINFO)' != '1'">true</LinkGenerateDebugInformation>
4341
<LinkProgramDataBaseFileName Condition="'$(BLD_REL_NO_DBINFO)' != '1'">$(OutputPath)\$(OutputName)$(_PDB_VER_NAME_)$(DllPdbFlavorSuffix)</LinkProgramDataBaseFileName>

‎stl/msbuild/stl_2/stl_2.files.settings.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
1111
">
1212
<BuildAs>nativecpp</BuildAs>
1313
</BuildFiles>
14-
<Link Condition="'$(Arm64X)' == 'true'" Include="$(IntermediateOutputDirectoryEC)\special_math.obj;"/>
1514
<BuildFiles Condition="'$(CrtBuildModelIsDll)' == 'true'" Include="
1615
$(CrtRoot)\github\stl\src\dllmain_satellite.cpp;
1716
">

‎stl/msbuild/stl_atomic_wait/stl_atomic_wait.files.settings.targets‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,4 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
1717
<BuildAs>nativecpp</BuildAs>
1818
</BuildFiles>
1919
</ItemGroup>
20-
21-
<!-- Specifying EC compilation objs for the cpp files from above -->
22-
<PropertyGroup>
23-
<ECObjs>
24-
$(IntermediateOutputDirectoryEC)\atomic_wait.obj;
25-
$(IntermediateOutputDirectoryEC)\parallel_algorithms.obj;
26-
</ECObjs>
27-
</PropertyGroup>
28-
29-
<ItemGroup Condition="'$(Arm64X)' == 'true' and '$(TargetNetFx)' != 'true'">
30-
<!-- Add EC symbols to import lib -->
31-
<ImportLib Include="$(ECObjs)" />
32-
<Link Include="$(ECObjs)"/>
33-
<Link Condition="'$(CrtBuildModelIsDll)' == 'true'" Include="
34-
$(IntermediateOutputDirectoryEC)\dllmain_satellite.obj;
35-
"/>
36-
</ItemGroup>
3720
</Project>

‎stl/msbuild/stl_base/libcp.settings.targets‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
3232

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

35-
<ItemGroup>
36-
<Lib Condition="'$(Arm64X)' == 'true'" Include="$(IntermediateOutputDirectoryEC)\%2A.obj;"/>
37-
</ItemGroup>
38-
3935
<Import Project="$(VCToolsRootPath)\crt\crt_build.targets"/>
4036
<Target Name="GetBaseAddress"/>
4137

0 commit comments

Comments
 (0)