Add /guard:cf flavor of bootstrapper (#1523)

Author: MichalStrehovsky

src/coreclr/nativeaot/Bootstrap/base/CMakeLists.txt

@@ -7,3 +7,9 @@ set(SOURCES
 add_library(bootstrapper STATIC ${SOURCES})
 
 install_static_library(bootstrapper aotsdk nativeaot)
+
+if (CLR_CMAKE_TARGET_WIN32)
+  add_library(bootstrapper.GuardCF STATIC ${SOURCES})
+  install_static_library(bootstrapper.GuardCF aotsdk nativeaot)
+  target_compile_options(bootstrapper.GuardCF PRIVATE $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/guard:cf>)
+endif()

src/coreclr/nativeaot/Bootstrap/dll/CMakeLists.txt

@@ -9,3 +9,9 @@ set(SOURCES
 add_library(bootstrapperdll STATIC ${SOURCES})
 
 install_static_library(bootstrapperdll aotsdk nativeaot)
+
+if (CLR_CMAKE_TARGET_WIN32)
+  add_library(bootstrapperdll.GuardCF STATIC ${SOURCES})
+  install_static_library(bootstrapperdll.GuardCF aotsdk nativeaot)
+  target_compile_options(bootstrapperdll.GuardCF PRIVATE $<$<OR:$<COMPILE_LANGUAGE:C>,$<COMPILE_LANGUAGE:CXX>>:/guard:cf>)
+endif()

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.props

@@ -24,7 +24,7 @@ The .NET Foundation licenses this file to you under the MIT license.
 
     <PropertyGroup>
       <FullRuntimeName>libRuntime.WorkstationGC</FullRuntimeName>
-      <FullRuntimeName Condition="'$(ServerGarbageCollection)' != ''">libRuntime.ServerGC</FullRuntimeName>
+      <FullRuntimeName Condition="'$(ServerGarbageCollection)' == 'true'">libRuntime.ServerGC</FullRuntimeName>
 
       <CrossCompileRid />
       <CrossCompileRid Condition="'$(TargetOS)' != 'OSX' and !$(RuntimeIdentifier.EndsWith('-$(OSHostArch)'))">$(RuntimeIdentifier)</CrossCompileRid>

src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.props

@@ -17,9 +17,12 @@ The .NET Foundation licenses this file to you under the MIT license.
     <CppCompiler>cl</CppCompiler>
     <CppLinker>link</CppLinker>
     <CppLibCreator>lib</CppLibCreator>
+    <LibrarySuffix>.lib</LibrarySuffix>
+    <LibrarySuffix Condition="'$(ControlFlowGuard)' == 'Guard'">.GuardCF.lib</LibrarySuffix>
     <FullRuntimeName>Runtime.WorkstationGC</FullRuntimeName>
-    <FullRuntimeName Condition="'$(ServerGarbageCollection)' != ''">Runtime.ServerGC</FullRuntimeName>
-    <FullRuntimeName Condition="'$(ControlFlowGuard)' == 'Guard'">Runtime.ServerGC.GuardCF</FullRuntimeName>
+    <FullRuntimeName Condition="'$(ServerGarbageCollection)' == 'true' or '$(ControlFlowGuard)' == 'Guard'">Runtime.ServerGC</FullRuntimeName>
+    <BootstrapperName>bootstrapper</BootstrapperName>
+    <BootstrapperName Condition="$(NativeLib) != ''">bootstrapperdll</BootstrapperName>
     <EntryPointSymbol Condition="'$(EntryPointSymbol)' == ''">wmainCRTStartup</EntryPointSymbol>
     <LinkerSubsystem Condition="'$(OutputType)' == 'WinExe' and '$(LinkerSubsystem)' == ''">WINDOWS</LinkerSubsystem>
     <LinkerSubsystem Condition="'$(OutputType)' == 'Exe' and '$(LinkerSubsystem)' == ''">CONSOLE</LinkerSubsystem>
@@ -29,9 +32,8 @@ The .NET Foundation licenses this file to you under the MIT license.
   <Target Name="SetupOSSpecificProps" DependsOnTargets="$(IlcDynamicBuildPropertyDependencies)">
 
     <ItemGroup>
-      <NativeLibrary Condition="$(NativeLib) == ''" Include="$(IlcPath)\sdk\bootstrapper.lib" />
-      <NativeLibrary Condition="$(NativeLib) != ''" Include="$(IlcPath)\sdk\bootstrapperdll.lib" />
-      <NativeLibrary Include="$(IlcPath)\sdk\$(FullRuntimeName).lib" />
+      <NativeLibrary Include="$(IlcPath)\sdk\$(BootstrapperName)$(LibrarySuffix)" />
+      <NativeLibrary Include="$(IlcPath)\sdk\$(FullRuntimeName)$(LibrarySuffix)" />
       <NativeLibrary Condition="'$(IlcMultiModule)' == 'true'" Include="$(SharedLibrary)" />
     </ItemGroup>