Merge pull request #74754 from hyp/eng/android-compiler-rt-buildps1

[windows][toolchain] build  android compiler-rt builtins when buildin…

Author: hyp

cmake/caches/Windows-x86_64.cmake

@@ -26,20 +26,34 @@ set(LLVM_DEFAULT_TARGET_TRIPLE x86_64-unknown-windows-msvc CACHE STRING "")
 set(LLVM_APPEND_VC_REV NO CACHE BOOL "")
 set(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR YES CACHE BOOL "")
 set(LLVM_ENABLE_PYTHON YES CACHE BOOL "")
+
+set(DEFAULT_BUILTIN_TARGETS
+      x86_64-unknown-windows-msvc
+      aarch64-unknown-windows-msvc)
+# Build the android builtins if NDK path is provided.
+if(NOT "$ENV{NDKPATH}" STREQUAL "")
+  list(APPEND DEFAULT_BUILTIN_TARGETS
+       aarch64-unknown-linux-android
+       x86_64-unknown-linux-android)
+endif()
+
+# The builtin targets are used to build the compiler-rt builtins.
+set(LLVM_BUILTIN_TARGETS ${DEFAULT_BUILTIN_TARGETS} CACHE STRING "")
+
+# The runtime targets are used to build the compiler-rt profile library.
 set(LLVM_RUNTIME_TARGETS
       x86_64-unknown-windows-msvc
       aarch64-unknown-windows-msvc
     CACHE STRING "")
+
 foreach(target ${LLVM_RUNTIME_TARGETS})
   set(RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES
         compiler-rt
       CACHE STRING "")
   set(RUNTIMES_${target}_CMAKE_MT mt CACHE STRING "")
-  if(${target} MATCHES windows-msvc)
-    set(RUNTIMES_${target}_CMAKE_SYSTEM_NAME Windows CACHE STRING "")
-  endif()
+  set(RUNTIMES_${target}_CMAKE_SYSTEM_NAME Windows CACHE STRING "")
   set(RUNTIMES_${target}_CMAKE_BUILD_TYPE Release CACHE STRING "")
-  set(RUNTIMES_${target}_COMPILER_RT_BUILD_BUILTINS YES CACHE BOOL "")
+  set(RUNTIMES_${target}_COMPILER_RT_BUILD_BUILTINS NO CACHE BOOL "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_CRT NO CACHE BOOL "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_LIBFUZZER NO CACHE BOOL "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_ORC NO CACHE BOOL "")
@@ -48,6 +62,27 @@ foreach(target ${LLVM_RUNTIME_TARGETS})
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_XRAY NO CACHE BOOL "")
 endforeach()
 
+foreach(target ${LLVM_BUILTIN_TARGETS})
+  set(BUILTINS_${target}_CMAKE_MT mt CACHE STRING "")
+  if(${target} MATCHES windows-msvc)
+    set(BUILTINS_${target}_CMAKE_SYSTEM_NAME Windows CACHE STRING "")
+  elseif(${target} MATCHES linux-android)
+    # Use a single 'linux' directory and arch-based lib names on Android.
+    set(BUILTINS_${target}_LLVM_ENABLE_PER_TARGET_RUNTIME_DIR NO CACHE BOOL "")
+    set(BUILTINS_${target}_CMAKE_SYSTEM_NAME Android CACHE STRING "")
+    if(${target} MATCHES aarch64)
+      set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI arm64-v8a CACHE STRING "")
+    else()
+      set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI x86_64 CACHE STRING "")
+    endif()
+    set(BUILTINS_${target}_CMAKE_ANDROID_NDK $ENV{NDKPATH} CACHE PATH "")
+    set(BUILTINS_${target}_CMAKE_ANDROID_API 21 CACHE STRING "")
+    set(BUILTINS_${target}_CMAKE_C_COMPILER_TARGET "${target}21" CACHE STRING "")
+    set(BUILTINS_${target}_CMAKE_CXX_COMPILER_TARGET "${target}21" CACHE STRING "")
+  endif()
+  set(BUILTINS_${target}_CMAKE_BUILD_TYPE Release CACHE STRING "")
+endforeach()
+
 set(LLVM_TARGETS_TO_BUILD AArch64 ARM WebAssembly X86 CACHE STRING "")
 
 # Disable certain targets to reduce the configure time or to avoid configuration
@@ -168,6 +203,7 @@ set(LLVM_DISTRIBUTION_COMPONENTS
       libclang
       libclang-headers
       LTO
+      builtins
       runtimes
       ${LLVM_TOOLCHAIN_TOOLS}
       ${CLANG_TOOLS}

utils/build.ps1

@@ -795,6 +795,7 @@ function Build-CMakeProject {
     [string[]] $UseBuiltCompilers = @(), # ASM,C,CXX,Swift
     [string[]] $UsePinnedCompilers = @(), # ASM,C,CXX,Swift
     [switch] $UseSwiftSwiftDriver = $false,
+    [switch] $AddAndroidCMakeEnv = $false,
     [string] $SwiftSDK = "",
     [hashtable] $Defines = @{}, # Values are either single strings or arrays of flags
     [string[]] $BuildTargets = @()
@@ -844,6 +845,12 @@ function Build-CMakeProject {
       TryAdd-KeyValue $Defines CMAKE_SYSTEM_PROCESSOR $Arch.CMakeName
     }
 
+    if ($AddAndroidCMakeEnv) {
+      # Set generic android options if we need to build an Android runtime component
+      # while building the compiler. Use an environment variable to pass it, to
+      # ensure that it can be accessed from the cmake cache file.
+      $env:NDKPATH = Get-AndroidNDKPath
+    }
     if ($Platform -eq "Android") {
       $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
       $VSInstallPath = & $vswhere -nologo -latest -products * -property installationPath
@@ -1333,6 +1340,7 @@ function Build-Compilers() {
       -Bin $CompilersBinaryCache `
       -InstallTo "$($Arch.ToolchainInstallRoot)\usr" `
       -Arch $Arch `
+      -AddAndroidCMakeEnv:$Android `
       -UseMSVCCompilers C,CXX `
       -UsePinnedCompilers Swift `
       -BuildTargets $Targets `