diff options
| author | Dean Michael Berris <dberris@google.com> | 2017-01-03 04:04:00 +0000 |
|---|---|---|
| committer | Dean Michael Berris <dberris@google.com> | 2017-01-03 04:04:00 +0000 |
| commit | b92697bddf3ec2631db9e850b6a885636748c08f (patch) | |
| tree | 16767016ce288af227468909b9485cc28f5896ca /lib/xray/CMakeLists.txt | |
| parent | 8693dcf62e1544df517549d95443aa2164a245c5 (diff) | |
Revert "[XRay][compiler-rt] XRay Flight Data Recorder Mode"
This reverts rL290852 as it breaks aarch64 and arm.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@290854 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/xray/CMakeLists.txt')
| -rw-r--r-- | lib/xray/CMakeLists.txt | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/lib/xray/CMakeLists.txt b/lib/xray/CMakeLists.txt index 581c4063e..9c7cf6ce3 100644 --- a/lib/xray/CMakeLists.txt +++ b/lib/xray/CMakeLists.txt @@ -1,15 +1,15 @@ # Build for the XRay runtime support library. -# XRay runtime library implementation files. +# Core XRay runtime library implementation files. set(XRAY_SOURCES - xray_inmemory_log.cc xray_init.cc - xray_flags.cc xray_interface.cc - xray_buffer_queue.cc - xray_log_interface.cc - xray_fdr_logging.cc - xray_utils.cc) + xray_flags.cc + xray_inmemory_log.cc) + +# XRay flight data recorder (FDR) implementation files. +set(XRAY_FDR_SOURCES + xray_buffer_queue.cc) set(x86_64_SOURCES xray_x86_64.cc @@ -21,13 +21,12 @@ set(arm_SOURCES xray_trampoline_arm.S ${XRAY_SOURCES}) -set(armhf_SOURCES - ${arm_SOURCES}) +set(armhf_SOURCES ${arm_SOURCES}) set(aarch64_SOURCES - xray_AArch64.cc - xray_trampoline_AArch64.S - ${XRAY_SOURCES}) + xray_AArch64.cc + xray_trampoline_AArch64.S + ${XRAY_SOURCES}) include_directories(..) include_directories(../../include) @@ -42,7 +41,13 @@ add_compiler_rt_object_libraries(RTXray SOURCES ${XRAY_SOURCES} CFLAGS ${XRAY_CFLAGS} DEFS ${XRAY_COMMON_DEFINITIONS}) +add_compiler_rt_object_libraries(RTXrayFDR + ARCHS ${XRAY_SUPPORTED_ARCH} + SOURCES ${XRAY_FDR_SOURCES} CFLAGS ${XRAY_CFLAGS} + DEFS ${XRAY_COMMON_DEFINITIONS}) + add_compiler_rt_component(xray) +add_compiler_rt_component(xray-fdr) set(XRAY_COMMON_RUNTIME_OBJECT_LIBS RTSanitizerCommon @@ -58,6 +63,14 @@ foreach(arch ${XRAY_SUPPORTED_ARCH}) DEFS ${XRAY_COMMON_DEFINITIONS} OBJECT_LIBS ${XRAY_COMMON_RUNTIME_OBJECT_LIBS} PARENT_TARGET xray) + add_compiler_rt_runtime(clang_rt.xray-fdr + STATIC + ARCHS ${arch} + SOURCES ${XRAY_FDR_SOURCES} + CFLAGS ${XRAY_CFLAGS} + DEFS ${XRAY_COMMON_DEFINITIONS} + OBJECT_LIBS ${XRAY_COMMON_RUNTIME_OBJECT_LIBS} + PARENT_TARGET xray-fdr) endif() endforeach() |