From 8f489def08827a36a34705d9f3596075d1272e0a Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Fri, 13 Jan 2023 16:28:48 +0200
Subject: [PATCH 1/2] Add support for llvm linker (lld)

---
 .../Microsoft.NETCore.Native.Unix.targets                 | 8 ++++++++
 .../BuildIntegration/Microsoft.NETCore.Native.targets     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index b55c7bd92a693..2b9dfbad4f4da 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -88,6 +88,7 @@ The .NET Foundation licenses this file to you under the MIT license.
     <Exec Command="$(IlcHostPackagePath)/native/src/libs/System.Globalization.Native/local_build.sh $(IlcHostPackagePath)/ $(IntermediateOutputPath)" Condition="'$(StaticICULinking)' == 'true'"/>
 
     <ItemGroup>
+      <LinkerArg Include="-fuse-ld=lld" Condition="'$(UseLLVMLinker)' == 'true'" />
       <LinkerArg Include="-static" Condition="'$(StaticExecutable)' == 'true'" />
       <LinkerArg Include="@(NativeLibrary)" />
       <LinkerArg Include="--sysroot=$(SysRoot)" Condition="'$(SysRoot)' != ''" />
@@ -183,5 +184,12 @@ The .NET Foundation licenses this file to you under the MIT license.
     <PropertyGroup Condition="'$(TargetOS)' == 'osx' and '$(StripSymbols)' == 'true' and $(_DsymUtilOutput.Contains('--minimize'))">
       <DsymUtilOptions>$(DsymUtilOptions) --minimize</DsymUtilOptions>
     </PropertyGroup>
+
+    <Exec Command="echo &quot;int main(void){}&quot; | &quot;$(CppCompilerAndLinker)&quot; -fuse-ld=lld -xc -o /dev/null -" IgnoreExitCode="true" StandardOutputImportance="Low" StandardErrorImportance="low" Condition="'$(UseLLVMLinker)' == 'true'">
+      <Output TaskParameter="ExitCode" PropertyName="_LLDAvailable" />
+    </Exec>
+
+    <Error Condition="'$(UseLLVMLinker)' == 'true' and '$(_LLDAvailable)' != '0'"
+      Text="LLVM linker (lld) was requested, but it wasn't found by the compiler driver '$(CppCompilerAndLinker)'" />
   </Target>
 </Project>
diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
index fe12a04fe1f2e..2e134e663a493 100755
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -330,7 +330,7 @@ The .NET Foundation licenses this file to you under the MIT license.
     </ItemGroup>
     <ItemGroup Condition="'$(TargetOS)' != 'windows' and '$(TargetOS)' != 'osx'">
       <CustomLinkerArg Include="-Wl,--discard-all" />
-      <CustomLinkerArg Include="-Wl,--gc-sections" />
+      <CustomLinkerArg Include="-Wl,--gc-sections" Condition="'$(UseLLVMLinker)' != 'true'" />
     </ItemGroup>
     <ItemGroup>
       <CustomLibArg Include="-crs &quot;$(NativeBinary)&quot;" Condition="'$(TargetOS)' != 'windows'" />

From d75f2e2e719f26aa9fd51f0b499b06d5f6a738cb Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Sat, 14 Jan 2023 09:43:52 +0200
Subject: [PATCH 2/2] Delete custom error handling

---
 .../BuildIntegration/Microsoft.NETCore.Native.Unix.targets | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
index 2b9dfbad4f4da..3edc4be7ea3db 100644
--- a/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
+++ b/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Unix.targets
@@ -184,12 +184,5 @@ The .NET Foundation licenses this file to you under the MIT license.
     <PropertyGroup Condition="'$(TargetOS)' == 'osx' and '$(StripSymbols)' == 'true' and $(_DsymUtilOutput.Contains('--minimize'))">
       <DsymUtilOptions>$(DsymUtilOptions) --minimize</DsymUtilOptions>
     </PropertyGroup>
-
-    <Exec Command="echo &quot;int main(void){}&quot; | &quot;$(CppCompilerAndLinker)&quot; -fuse-ld=lld -xc -o /dev/null -" IgnoreExitCode="true" StandardOutputImportance="Low" StandardErrorImportance="low" Condition="'$(UseLLVMLinker)' == 'true'">
-      <Output TaskParameter="ExitCode" PropertyName="_LLDAvailable" />
-    </Exec>
-
-    <Error Condition="'$(UseLLVMLinker)' == 'true' and '$(_LLDAvailable)' != '0'"
-      Text="LLVM linker (lld) was requested, but it wasn't found by the compiler driver '$(CppCompilerAndLinker)'" />
   </Target>
 </Project>