[compiler-rt] f63b1bf - [ORC-RT] Include TLV support in x86-64 Haswell slice.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2021-08-10T21:01:40+10:00
New Revision: f63b1bf7f49edcb4e5eb05000ddb3d2f5e9052e6

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

LOG: [ORC-RT] Include TLV support in x86-64 Haswell slice.

Darwin/MachO TLV support was only getting built into the x86_64 slice, not the
x86_64h slice. This caused errors when using the ORC runtime on Haswell
machines.

rdar://81056700

Added: 
    

Modified: 
    compiler-rt/lib/orc/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/orc/CMakeLists.txt b/compiler-rt/lib/orc/CMakeLists.txt
index 22381d8da0a74..d502bb1ea6f9e 100644
--- a/compiler-rt/lib/orc/CMakeLists.txt
+++ b/compiler-rt/lib/orc/CMakeLists.txt
@@ -59,6 +59,8 @@ if (TARGET cxx-headers OR HAVE_LIBCXX)
 endif()
 
 if (APPLE)
+   add_asm_sources(ORC_ASM_SOURCES macho_tlv.x86_64.S)
+
   add_compiler_rt_object_libraries(RTOrc
     OS ${ORC_SUPPORTED_OS}
     ARCHS ${ORC_SUPPORTED_ARCH}