Skip to content

Port MSVC-internal changes, again #1431

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

Merged
Stephan T. Lavavej (StephanTLavavej) merged 1 commit into from
Nov 7, 2020
Merged

Port MSVC-internal changes, again #1431

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
Binary file modified stl/aliases/arm64ec/std_init_once_begin_initialize.obj
View file
Open in desktop
Binary file not shown.
Binary file modified stl/aliases/arm64ec/std_init_once_complete.obj
View file
Open in desktop
Binary file not shown.
6 changes: 2 additions & 4 deletions stl/aliases/generate.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ mkdir arm64ec
chpe\std_init_once_begin_initialize.obj
..\..\..\..\..\tools\amd64\aliasobj.exe ^
/machine:arm64ec ^
__imp___std_init_once_begin_initialize ^
__imp_InitOnceBeginInitialize ^
-m std_init_once_begin_initialize-arm64ec.txt ^
arm64ec\std_init_once_begin_initialize.obj

:: __std_init_once_complete
Expand All @@ -72,6 +71,5 @@ mkdir arm64ec
chpe\std_init_once_complete.obj
..\..\..\..\..\tools\amd64\aliasobj.exe ^
/machine:arm64ec ^
__imp___std_init_once_complete ^
__imp_InitOnceComplete ^
-m std_init_once_complete-arm64ec.txt ^
arm64ec\std_init_once_complete.obj
2 changes: 2 additions & 0 deletions stl/aliases/std_init_once_begin_initialize-arm64ec.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#__std_init_once_begin_initialize #InitOnceBeginInitialize
__imp___std_init_once_begin_initialize __imp_InitOnceBeginInitialize
2 changes: 2 additions & 0 deletions stl/aliases/std_init_once_complete-arm64ec.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#__std_init_once_complete #InitOnceComplete
__imp___std_init_once_complete __imp_InitOnceComplete
1 change: 0 additions & 1 deletion stl/msbuild/stl_1/stl_1.files.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
">
<BuildAs>nativecpp</BuildAs>
</BuildFiles>
<Link Condition="'$(Arm64X)' == 'true'" Include="$(IntermediateOutputDirectoryEC)\memory_resource.obj;"/>
<BuildFiles Condition="'$(CrtBuildModelIsDll)' == 'true'" Include="
$(CrtRoot)\github\stl\src\dllmain_satellite.cpp;
">
Expand Down
2 changes: 0 additions & 2 deletions stl/msbuild/stl_2/msvcp_2.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
<IntermediateImportLibOutput>$(CrtBuildDir)\msvcprt_2$(BuildSuffix).$(MsvcpFlavor).import_only.lib</IntermediateImportLibOutput>
<DllDefName>$(LibOutputFileName).$(MsvcpFlavor)</DllDefName>
<DllDef>$(IntermediateOutputDirectory)\$(DllDefName).def</DllDef>
<DllDef Condition="'$(Arm64X)' == 'true'">$(IntermediateOutputDirectoryEC)\$(DllDefName).def</DllDef>
<DllDefArm64Native Condition="'$(Arm64X)' == 'true'">$(IntermediateOutputDirectory)\$(DllDefName).def</DllDefArm64Native>

<LinkGenerateDebugInformation Condition="'$(BLD_REL_NO_DBINFO)' != '1'">true</LinkGenerateDebugInformation>
<LinkProgramDataBaseFileName Condition="'$(BLD_REL_NO_DBINFO)' != '1'">$(OutputPath)\$(OutputName)$(_PDB_VER_NAME_)$(DllPdbFlavorSuffix)</LinkProgramDataBaseFileName>
Expand Down
1 change: 0 additions & 1 deletion stl/msbuild/stl_2/stl_2.files.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
">
<BuildAs>nativecpp</BuildAs>
</BuildFiles>
<Link Condition="'$(Arm64X)' == 'true'" Include="$(IntermediateOutputDirectoryEC)\special_math.obj;"/>
<BuildFiles Condition="'$(CrtBuildModelIsDll)' == 'true'" Include="
$(CrtRoot)\github\stl\src\dllmain_satellite.cpp;
">
Expand Down
17 changes: 0 additions & 17 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 @@ -17,21 +17,4 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
<BuildAs>nativecpp</BuildAs>
</BuildFiles>
</ItemGroup>

<!-- Specifying EC compilation objs for the cpp files from above -->
<PropertyGroup>
<ECObjs>
$(IntermediateOutputDirectoryEC)\atomic_wait.obj;
$(IntermediateOutputDirectoryEC)\parallel_algorithms.obj;
</ECObjs>
</PropertyGroup>

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

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

<ItemGroup>
<Lib Condition="'$(Arm64X)' == 'true'" Include="$(IntermediateOutputDirectoryEC)\%2A.obj;"/>
</ItemGroup>

<Import Project="$(VCToolsRootPath)\crt\crt_build.targets"/>
<Target Name="GetBaseAddress"/>

Expand Down
288 changes: 0 additions & 288 deletions stl/msbuild/stl_base/msvcp.settings.targets
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions stl/msbuild/stl_codecvt_ids/msvcp_codecvt_ids.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
<LinkRelease>true</LinkRelease>
</PropertyGroup>

<PropertyGroup Condition="'$(Arm64X)' == 'true' and '$(TargetNetFx)' != 'true'">
<DllDef>$(IntermediateOutputDirectoryEC)\$(DllDefName).def</DllDef>
<DllDefArm64Native>$(IntermediateOutputDirectory)\$(DllDefName).def</DllDefArm64Native>
</PropertyGroup>

<ItemGroup>
<CppPreprocess Include="$(MSBuildThisFileDirectory)\msvcprt_codecvt_ids.src">
<Defines>LIBRARYNAME=$(OutputName.ToUpper());$(DllCppDefines)</Defines>
Expand All @@ -75,11 +70,6 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
<TargetLib Include="$(UniversalCRTLib)"/>
</ItemGroup>

<ItemGroup Condition="'$(Arm64X)' == 'true' and '$(TargetNetFx)' != 'true'">
<ImportLib Include="$(IntermediateOutputDirectoryEC)\ulocale.obj" />
<Link Include="$(IntermediateOutputDirectoryEC)\ulocale.obj" />
</ItemGroup>

<!-- Copy the output dll and pdb to various destinations -->
<ItemGroup>
<CopyFilesForCrossTools Condition="'$(MsvcpFlavor)' == 'kernel32'" Include="
Expand Down
20 changes: 15 additions & 5 deletions stl/msbuild/stl_post/msvcp_post.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,21 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
Include="$(CrtRoot)\github\stl\msbuild\stl_codecvt_ids\$(CrtBuildModel)\msvcp_codecvt_ids_$(MsvcpFlavor)\msvcp_codecvt_ids.nativeproj"/>
<ProjectReference Condition="'$(CanSkipProjectReferenceForTargetLib)' != 'true'"
Include="$(CrtRoot)\github\stl\msbuild\stl_atomic_wait\$(CrtBuildModel)\msvcp_atomic_wait_$(MsvcpFlavor)\msvcp_atomic_wait.nativeproj"/>
<Lib Include="$(CrtLibPath)\msvcprt_base$(BuildSuffix)$(ClrLibSuffix).lib"/>
<Lib Include="$(CrtLibPath)\msvcprt_1$(BuildSuffix)$(ClrLibSuffix).lib"/>
<Lib Include="$(CrtLibPath)\msvcprt_2$(BuildSuffix)$(ClrLibSuffix).lib"/>
<Lib Include="$(CrtLibPath)\msvcprt$(BuildSuffix)_codecvt_ids$(ClrLibSuffix).lib"/>
<Lib Include="$(CrtLibPath)\msvcprt$(BuildSuffix)_atomic_wait$(ClrLibSuffix).lib"/>
<Lib Include="$(CrtLibPath)\msvcprt_base$(BuildSuffix)$(ClrLibSuffix).lib">
<IncludeInChameleonLib>false</IncludeInChameleonLib>
</Lib>
<Lib Include="$(CrtLibPath)\msvcprt_1$(BuildSuffix)$(ClrLibSuffix).lib">
<IncludeInChameleonLib>false</IncludeInChameleonLib>
</Lib>
<Lib Include="$(CrtLibPath)\msvcprt_2$(BuildSuffix)$(ClrLibSuffix).lib">
<IncludeInChameleonLib>false</IncludeInChameleonLib>
Comment thread
StephanTLavavej marked this conversation as resolved.
</Lib>
<Lib Include="$(CrtLibPath)\msvcprt$(BuildSuffix)_codecvt_ids$(ClrLibSuffix).lib">
<IncludeInChameleonLib>false</IncludeInChameleonLib>
</Lib>
<Lib Include="$(CrtLibPath)\msvcprt$(BuildSuffix)_atomic_wait$(ClrLibSuffix).lib">
<IncludeInChameleonLib>false</IncludeInChameleonLib>
</Lib>
<Lib Include="$(MSBuildThisFileDirectory)\..\..\aliases\$(BuildArchitecture)\std_init_once_begin_initialize.obj" />
<Lib Include="$(MSBuildThisFileDirectory)\..\..\aliases\$(BuildArchitecture)\std_init_once_complete.obj" />
</ItemGroup>
Expand Down