Align default targets for builtins and runtimes on x86_64 hosts

Author: weliveindetail

cmake/caches/Windows-x86_64.cmake

@@ -27,24 +27,21 @@ 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
+set(default_targets
       x86_64-unknown-windows-msvc
-      aarch64-unknown-windows-msvc)
+      aarch64-unknown-windows-msvc
+      i686-unknown-windows-msvc)
 # Build the android builtins if NDK path is provided.
 if(NOT "$ENV{NDKPATH}" STREQUAL "")
-  list(APPEND DEFAULT_BUILTIN_TARGETS
+  list(APPEND default_targets
        aarch64-unknown-linux-android
-       x86_64-unknown-linux-android)
+       x86_64-unknown-linux-android
+       i686-unknown-linux-android
+       armv7-unknown-linux-androideabi)
 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 profile and sanitizer libs from compiler-rt.
-set(LLVM_RUNTIME_TARGETS
-      x86_64-unknown-windows-msvc
-      aarch64-unknown-windows-msvc
-    CACHE STRING "")
+set(LLVM_BUILTIN_TARGETS ${default_targets} CACHE STRING "")
+set(LLVM_RUNTIME_TARGETS ${default_targets} CACHE STRING "")
 
 foreach(target ${LLVM_RUNTIME_TARGETS})
   set(RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES
@@ -74,6 +71,10 @@ foreach(target ${LLVM_BUILTIN_TARGETS})
     set(BUILTINS_${target}_CMAKE_SYSTEM_NAME Android CACHE STRING "")
     if(${target} MATCHES aarch64)
       set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI arm64-v8a CACHE STRING "")
+    elseif(${target} MATCHES armv7)
+      set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI armeabi-v7a CACHE STRING "")
+    elseif(${target} MATCHES i686)
+      set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI i686 CACHE STRING "")
     else()
       set(BUILTINS_${target}_CMAKE_ANDROID_ARCH_ABI x86_64 CACHE STRING "")
     endif()

utils/build.ps1

@@ -2777,8 +2777,12 @@ if (-not $SkipBuild) {
   Invoke-BuildStep Build-Compilers $HostArch
   if ($IncludeSanitizers) {
     $InstallTo = "$($HostArch.ToolchainInstallRoot)\usr"
-    Invoke-BuildStep Build-Sanitizers Windows $ArchX64 $InstallTo
-    Invoke-BuildStep Build-Sanitizers Windows $ArchARM64 $InstallTo
+    foreach ($Arch in $WindowsSDKArchs) {
+      Invoke-BuildStep Build-Sanitizers Windows $Arch $InstallTo
+    }
+    foreach ($Arch in $AndroidSDKArchs) {
+      Invoke-BuildStep Build-Sanitizers Windows $Arch $InstallTo
+    }
   }
 }