[compiler-rt] f481256 - [builtins] Build for arm64e for Darwin

[Shoaib Meenai via llvm-commits]

Author: Shoaib Meenai
Date: 2020-03-11T22:01:44-07:00
New Revision: f481256bfe0eae891aaa25f401837f4b2360461b

URL: https://github.com/llvm/llvm-project/commit/f481256bfe0eae891aaa25f401837f4b2360461b
DIFF: https://github.com/llvm/llvm-project/commit/f481256bfe0eae891aaa25f401837f4b2360461b.diff

LOG: [builtins] Build for arm64e for Darwin

https://github.com/apple/swift/pull/30112/ makes the Swift standard
library for iOS build for arm64e. If you're building Swift against your
own LLVM, this in turn requires having the builtins built for arm64e,
otherwise you won't be able to use the builtins (which will in turn lead
to an undefined symbol for `__isOSVersionAtLeast`). Make the builtins
build for arm64e to fix this.

Differential Revision: https://reviews.llvm.org/D76041

Added: 
    

Modified: 
    compiler-rt/cmake/builtin-config-ix.cmake
    compiler-rt/lib/builtins/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/cmake/builtin-config-ix.cmake b/compiler-rt/cmake/builtin-config-ix.cmake
index cd8e6fa9c9ad..1bd7ad46df44 100644
--- a/compiler-rt/cmake/builtin-config-ix.cmake
+++ b/compiler-rt/cmake/builtin-config-ix.cmake
@@ -39,7 +39,7 @@ set(WASM32 wasm32)
 set(WASM64 wasm64)
 
 if(APPLE)
-  set(ARM64 arm64)
+  set(ARM64 arm64 arm64e)
   set(ARM32 armv7 armv7k armv7s)
   set(X86_64 x86_64 x86_64h)
 endif()

diff  --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt
index 21cac1c23539..f63f06c3bfa2 100644
--- a/compiler-rt/lib/builtins/CMakeLists.txt
+++ b/compiler-rt/lib/builtins/CMakeLists.txt
@@ -485,6 +485,7 @@ set(armv7_SOURCES ${arm_SOURCES})
 set(armv7s_SOURCES ${arm_SOURCES})
 set(armv7k_SOURCES ${arm_SOURCES})
 set(arm64_SOURCES ${aarch64_SOURCES})
+set(arm64e_SOURCES ${aarch64_SOURCES})
 
 # macho_embedded archs
 set(armv6m_SOURCES ${thumb1_SOURCES})