[build] Remove `llvm` submodule (#3043)

We should prefer using mono's `llvm` submodule instead of providing our own, as: 1. Having *both* `external/llvm` *and* `external/mono/external/llvm` is confusing (which one "wins"?), and 2. The one that *actually* matters ("wins") is mono's `llvm`, as that's the one included in the mono archive, which is now used by default (333b98b3). Simplify life. Remove `external/llvm`.
2019-05-01 17:02:15 -04:00 · 2019-05-01 17:02:15 -04:00 · cb855ba8a4
--- a/.gitmodules
+++ b/.gitmodules
@ -18,10 +18,6 @@
    path = external/LibZipSharp
    url = https://github.com/grendello/LibZipSharp.git
    branch = master
-[submodule "external/llvm"]
-    path = external/llvm
-    url = https://github.com/mono/llvm.git
-    branch = release_60
 [submodule "external/mman-win32"]
    path = external/mman-win32
    url = https://github.com/witwall/mman-win32.git
--- a/Configuration.props
+++ b/Configuration.props
@ -77,7 +77,6 @@
    <AndroidSupportedHostJitAbis Condition=" '$(AndroidSupportedHostJitAbis)' == '' ">$(HostOS)</AndroidSupportedHostJitAbis>
    <AndroidSupportedTargetJitAbis Condition=" '$(AndroidSupportedTargetJitAbis)' == '' ">armeabi-v7a:arm64-v8a:x86</AndroidSupportedTargetJitAbis>
    <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
-    <LlvmSourceDirectory Condition=" '$(LlvmSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\llvm</LlvmSourceDirectory>
    <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">6.0.0</MonoRequiredMinimumVersion>
    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">6.1.0</MonoRequiredMaximumVersion>
@ -119,7 +118,6 @@
    <AndroidNdkFullPath>$([System.IO.Path]::GetFullPath ('$(AndroidNdkDirectory)'))</AndroidNdkFullPath>
    <AndroidSdkFullPath>$([System.IO.Path]::GetFullPath ('$(AndroidSdkDirectory)'))</AndroidSdkFullPath>
    <JavaInteropFullPath>$([System.IO.Path]::GetFullPath ('$(JavaInteropSourceDirectory)'))</JavaInteropFullPath>
-    <LlvmSourceFullPath>$([System.IO.Path]::GetFullPath ('$(LlvmSourceDirectory)'))</LlvmSourceFullPath>
    <MonoSourceFullPath>$([System.IO.Path]::GetFullPath ('$(MonoSourceDirectory)'))</MonoSourceFullPath>
    <LinkerSourceFullPath>$([System.IO.Path]::GetFullPath ('$(LinkerSourceDirectory)'))</LinkerSourceFullPath>
    <SqliteSourceFullPath>$([System.IO.Path]::GetFullPath ('$(SqliteSourceDirectory)'))</SqliteSourceFullPath>
--- a/Documentation/workflow/HowToBumpMono.md
+++ b/Documentation/workflow/HowToBumpMono.md
@ -87,7 +87,6 @@ index a2a9c1d1..ec78ddb4 100644
 +++ b/Configuration.props
@@ -70,8 +70,8 @@
     <JavaInteropSourceDirectory Condition=" '$(JavaInteropSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\Java.Interop</JavaInteropSourceDirectory>
-     <LlvmSourceDirectory Condition=" '$(LlvmSourceDirectory)' == '' ">$(MSBuildThisFileDirectory)external\llvm</LlvmSourceDirectory>
     <MonoSourceDirectory>$(MSBuildThisFileDirectory)external\mono</MonoSourceDirectory>
 -    <MonoRequiredMinimumVersion Condition=" '$(MonoRequiredMinimumVersion)' == '' ">5.14.0</MonoRequiredMinimumVersion>
 -    <MonoRequiredMaximumVersion Condition=" '$(MonoRequiredMaximumVersion)' == '' ">5.15.0</MonoRequiredMaximumVersion>
--- a/build-tools/create-bundle/bundle-path.targets
+++ b/build-tools/create-bundle/bundle-path.targets
@ -9,12 +9,6 @@
        ToolExe="$(GitToolExe)">
      <Output TaskParameter="AbbreviatedCommitHash"   PropertyName="_LibZipHash" />
    </GitCommitHash>
-    <GitCommitHash
-        WorkingDirectory="$(LlvmSourceFullPath)"
-        ToolPath="$(GitToolPath)"
-        ToolExe="$(GitToolExe)">
-      <Output TaskParameter="AbbreviatedCommitHash"   PropertyName="_LlvmHash" />
-    </GitCommitHash>
    <GitCommitHash
        WorkingDirectory="$(MonoSourceFullPath)"
        ToolPath="$(GitToolPath)"
@ -37,8 +31,8 @@
      DependsOnTargets="_GetHashes">
    <PropertyGroup>
      <XABundleVersion>v21</XABundleVersion>
-      <XABundleFileName Condition=" '$(HostOS)' != 'Windows' AND '$(XABundleFileName)' == '' ">bundle-$(XABundleVersion)-h$(_VersionHash)-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
-      <XABundleFileName Condition=" '$(HostOS)' == 'Windows' AND '$(XABundleFileName)' == '' ">bundle-$(XABundleVersion)-h$(_VersionHash)-$(Configuration)-Darwin-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
+      <XABundleFileName Condition=" '$(HostOS)' != 'Windows' AND '$(XABundleFileName)' == '' ">bundle-$(XABundleVersion)-h$(_VersionHash)-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),mono=$(_MonoHash).zip</XABundleFileName>
+      <XABundleFileName Condition=" '$(HostOS)' == 'Windows' AND '$(XABundleFileName)' == '' ">bundle-$(XABundleVersion)-h$(_VersionHash)-$(Configuration)-Darwin-libzip=$(_LibZipHash),mono=$(_MonoHash).zip</XABundleFileName>
    </PropertyGroup>
  </Target>
 </Project>
--- a/build-tools/scripts/Paths.targets
+++ b/build-tools/scripts/Paths.targets
@ -25,12 +25,6 @@
        Importance="High"
    />
  </Target>
-  <Target Name="GetLlvmSourceFullPath">
-    <Message
-        Text="$(LlvmSourceFullPath)"
-        Importance="High"
-    />
-  </Target>
  <Target Name="GetMonoSourceFullPath">
    <Message
        Text="$(MonoSourceFullPath)"
--- a/external/llvm
+++ b/external/llvm
@ -1 +0,0 @@
-Subproject commit 2c2cffedf01e0fe266b9aaad2c2563e05b750ff4
--- a/external/llvm.tpnitems
+++ b/external/llvm.tpnitems
@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <_NeedLlvm Condition=" '$(AndroidSupportedTargetAotAbis)' != '' ">True</_NeedLlvm>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(TpnIncludeExternalDependencies)' == 'True' And ('$(TpnIncludeBuildDependencies)' == 'True' Or '$(_NeedLlvm)' != '') ">
-    <ThirdPartyNotice Include="llvm">
-      <LicenseFile>$(MSBuildThisFileDirectory)\llvm\LICENSE.TXT</LicenseFile>
-      <SourceUrl>https://github.com/mono/llvm/</SourceUrl>
-    </ThirdPartyNotice>
-    <ThirdPartyNotice Include="llvm Google Test">
-      <LicenseFile>$(MSBuildThisFileDirectory)\llvm\utils\unittest\googletest\LICENSE.TXT</LicenseFile>
-      <SourceUrl>https://github.com/mono/llvm/tree/master/utils/unittest/googletest/</SourceUrl>
-    </ThirdPartyNotice>
-    <ThirdPartyNotice Include="llvm OpenBSD regex">
-      <LicenseFile>$(MSBuildThisFileDirectory)\llvm\lib\Support\COPYRIGHT.regex</LicenseFile>
-      <SourceUrl>https://github.com/mono/llvm/tree/master/lib/Support/</SourceUrl>
-    </ThirdPartyNotice>
-    <ThirdPartyNotice Include="llvm pyyaml tests">
-      <LicenseFile>$(MSBuildThisFileDirectory)\llvm\test\YAMLParser\LICENSE.txt</LicenseFile>
-      <SourceUrl>https://github.com/mono/llvm/tree/master/test/YAMLParser/</SourceUrl>
-    </ThirdPartyNotice>
-    <ThirdPartyNotice Include="llvm ARM contributions">
-      <LicenseFile>$(MSBuildThisFileDirectory)\llvm\lib\Target\ARM\LICENSE.TXT</LicenseFile>
-      <SourceUrl>https://github.com/mono/llvm/tree/master/lib/Target/ARM/</SourceUrl>
-    </ThirdPartyNotice>
-    <ThirdPartyNotice Include="llvm md5 contributions">
-      <LicenseText>
-        This software was written by Alexander Peslyak in 2001.  No copyright is
-        claimed, and the software is hereby placed in the public domain.
-        In case this attempt to disclaim copyright and place the software in the
-        public domain is deemed null and void, then the software is
-        Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
-        general public under the following terms:
-
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted.
-
-        There's ABSOLUTELY NO WARRANTY, express or implied.
-
-        (This is a heavily cut-down "BSD license".)
-      </LicenseText>
-      <SourceUrl>https://github.com/mono/llvm/blob/master/lib/Support/MD5.cpp</SourceUrl>
-    </ThirdPartyNotice>
-  </ItemGroup>
-</Project>
--- a/external/mono.tpnitems
+++ b/external/mono.tpnitems
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_NeedLlvm Condition=" '$(AndroidSupportedTargetAotAbis)' != '' ">True</_NeedLlvm>
+  </PropertyGroup>
  <ItemGroup Condition=" '$(TpnIncludeExternalDependencies)' == 'True' ">
    <ThirdPartyNotice Include="mono/mono">
      <LicenseFile>$(MSBuildThisFileDirectory)\mono\LICENSE</LicenseFile>
@ -91,4 +94,44 @@
      <SourceUrl>https://github.com/mono/rx/</SourceUrl>
    </ThirdPartyNotice>
  </ItemGroup>
+  <ItemGroup Condition=" '$(TpnIncludeExternalDependencies)' == 'True' And ('$(TpnIncludeBuildDependencies)' == 'True' Or '$(_NeedLlvm)' != '') ">
+    <ThirdPartyNotice Include="llvm">
+      <LicenseFile>$(MSBuildThisFileDirectory)mono\external\llvm\LICENSE.TXT</LicenseFile>
+      <SourceUrl>https://github.com/mono/llvm/</SourceUrl>
+    </ThirdPartyNotice>
+    <ThirdPartyNotice Include="llvm Google Test">
+      <LicenseFile>$(MSBuildThisFileDirectory)mono\external\llvm\utils\unittest\googletest\LICENSE.TXT</LicenseFile>
+      <SourceUrl>https://github.com/mono/llvm/tree/master/utils/unittest/googletest/</SourceUrl>
+    </ThirdPartyNotice>
+    <ThirdPartyNotice Include="llvm OpenBSD regex">
+      <LicenseFile>$(MSBuildThisFileDirectory)mono\external\llvm\lib\Support\COPYRIGHT.regex</LicenseFile>
+      <SourceUrl>https://github.com/mono/llvm/tree/master/lib/Support/</SourceUrl>
+    </ThirdPartyNotice>
+    <ThirdPartyNotice Include="llvm pyyaml tests">
+      <LicenseFile>$(MSBuildThisFileDirectory)mono\external\llvm\test\YAMLParser\LICENSE.txt</LicenseFile>
+      <SourceUrl>https://github.com/mono/llvm/tree/master/test/YAMLParser/</SourceUrl>
+    </ThirdPartyNotice>
+    <ThirdPartyNotice Include="llvm ARM contributions">
+      <LicenseFile>$(MSBuildThisFileDirectory)mono\external\llvm\lib\Target\ARM\LICENSE.TXT</LicenseFile>
+      <SourceUrl>https://github.com/mono/llvm/tree/master/lib/Target/ARM/</SourceUrl>
+    </ThirdPartyNotice>
+    <ThirdPartyNotice Include="llvm md5 contributions">
+      <LicenseText>
+        This software was written by Alexander Peslyak in 2001.  No copyright is
+        claimed, and the software is hereby placed in the public domain.
+        In case this attempt to disclaim copyright and place the software in the
+        public domain is deemed null and void, then the software is
+        Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
+        general public under the following terms:
+
+        Redistribution and use in source and binary forms, with or without
+        modification, are permitted.
+
+        There's ABSOLUTELY NO WARRANTY, express or implied.
+
+        (This is a heavily cut-down "BSD license".)
+      </LicenseText>
+      <SourceUrl>https://github.com/mono/llvm/blob/master/lib/Support/MD5.cpp</SourceUrl>
+    </ThirdPartyNotice>
+  </ItemGroup>
 </Project>
--- a/src/mono-runtimes/mono-runtimes.targets
+++ b/src/mono-runtimes/mono-runtimes.targets
@ -45,10 +45,9 @@
    <_MonoSdksAndroidToolchainDir>$(AndroidToolchainDirectory)</_MonoSdksAndroidToolchainDir>
    <_MonoSdksAndroidToolchainCacheDir>$(AndroidToolchainCacheDirectory)</_MonoSdksAndroidToolchainCacheDir>
    <_MonoSdksAndroidToolchainPrefix>$(AndroidToolchainDirectory)\toolchains</_MonoSdksAndroidToolchainPrefix>
-    <_MonoSdksLlvmSrc>$(MSBuildThisFileDirectory)..\..\external\llvm</_MonoSdksLlvmSrc>
    <_MonoSdksMxePrefixDir>$(AndroidToolchainDirectory)</_MonoSdksMxePrefixDir>
    <_MonoSdksMxeSrc>$(MSBuildThisFileDirectory)..\..\external\mxe</_MonoSdksMxeSrc>
-    <_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=false IGNORE_PROVISION_ANDROID=true ANDROID_CMAKE_VERSION=$(AndroidCmakeVersionPath) ANDROID_NDK_VERSION=r$(AndroidNdkVersion) ANDROID_SDK_VERSION_armeabi-v7a=$(AndroidNdkApiLevel_ArmV7a) ANDROID_SDK_VERSION_arm64-v8a=$(AndroidNdkApiLevel_ArmV8a) ANDROID_SDK_VERSION_x86=$(AndroidNdkApiLevel_X86) ANDROID_SDK_VERSION_x86_64=$(AndroidNdkApiLevel_X86_64) ANDROID_TOOLCHAIN_DIR=&quot;$(_MonoSdksAndroidToolchainDir)&quot; ANDROID_TOOLCHAIN_CACHE_DIR=&quot;$(_MonoSdksAndroidToolchainCacheDir)&quot; ANDROID_TOOLCHAIN_PREFIX=&quot;$(_MonoSdksAndroidToolchainPrefix)&quot; LLVM_SRC=&quot;$(_MonoSdksLlvmSrc)&quot; MXE_PREFIX_DIR=&quot;$(_MonoSdksMxePrefixDir)&quot; MXE_SRC=&quot;$(_MonoSdksMxeSrc)&quot;</_MonoSdksParameters>
+    <_MonoSdksParameters>CONFIGURATION=$(_MonoSdksConfiguration) IGNORE_PROVISION_MXE=false IGNORE_PROVISION_ANDROID=true ANDROID_CMAKE_VERSION=$(AndroidCmakeVersionPath) ANDROID_NDK_VERSION=r$(AndroidNdkVersion) ANDROID_SDK_VERSION_armeabi-v7a=$(AndroidNdkApiLevel_ArmV7a) ANDROID_SDK_VERSION_arm64-v8a=$(AndroidNdkApiLevel_ArmV8a) ANDROID_SDK_VERSION_x86=$(AndroidNdkApiLevel_X86) ANDROID_SDK_VERSION_x86_64=$(AndroidNdkApiLevel_X86_64) ANDROID_TOOLCHAIN_DIR=&quot;$(_MonoSdksAndroidToolchainDir)&quot; ANDROID_TOOLCHAIN_CACHE_DIR=&quot;$(_MonoSdksAndroidToolchainCacheDir)&quot; ANDROID_TOOLCHAIN_PREFIX=&quot;$(_MonoSdksAndroidToolchainPrefix)&quot; MXE_PREFIX_DIR=&quot;$(_MonoSdksMxePrefixDir)&quot; MXE_SRC=&quot;$(_MonoSdksMxeSrc)&quot;</_MonoSdksParameters>
  </PropertyGroup>
  <PropertyGroup>
    <ForceBuildDependsOn>
@ -137,13 +136,6 @@
      <Output TaskParameter="Time" PropertyName="_MonoCommitTime" />
    </GitCommitTime>
    <Touch Files="$(MonoSourceFullPath)\autogen.sh" Time="$(_MonoCommitTime)" />
-    <GitCommitTime
-        WorkingDirectory="$(LlvmSourceFullPath)"
-        ToolPath="$(GitToolPath)"
-        ToolExe="$(GitToolExe)">
-      <Output TaskParameter="Time" PropertyName="_LlvmCommitTime" />
-    </GitCommitTime>
-    <Touch Files="$(LlvmSourceFullPath)\CMakeLists.txt" Time="$(_LlvmCommitTime)" />
  </Target>

  <Target Name="_GetLlvmOutputItems">
@ -629,13 +621,13 @@

  <Target Name="ForceBuild"
      DependsOnTargets="GetMonoBundleItems;$(ForceBuildDependsOn)"
-      Inputs="$(MonoSourceFullPath)\autogen.sh;$(LlvmSourceFullPath)\CMakeLists.txt"
+      Inputs="$(MonoSourceFullPath)\autogen.sh"
      Outputs="@(BundleItem)">
  </Target>

  <Target Name="_BuildUnlessCached"
      DependsOnTargets="_SetAutogenShTimeToLastCommitTimestamp;GetMonoBundleItems"
-      Inputs="$(MonoSourceFullPath)\autogen.sh;$(LlvmSourceFullPath)\CMakeLists.txt"
+      Inputs="$(MonoSourceFullPath)\autogen.sh"
      Outputs="@(BundleItem)">
    <PropertyGroup>
      <_Now>$([System.DateTime]::Now.Ticks)</_Now>
				`@ -1 +0,0 @@`
				`Subproject commit 2c2cffedf01e0fe266b9aaad2c2563e05b750ff4`