From 28832d2b36339f7c52e4e0cc914434900d4b963e Mon Sep 17 00:00:00 2001
From: Dean Michael Berris <dberris@google.com>
Date: Tue, 28 Nov 2017 22:33:07 +0000
Subject: [PATCH] [XRay][compiler-rt] Fix runtime build

This isolates the per-architecture files from the common files
implementing the XRay facilities. Because of the refactoring done in
D39114, we were including the definition of the sources in the archive
twice, causing link-time failures.

Follow-up to D39114.

llvm-svn: 319241
---
 compiler-rt/lib/xray/CMakeLists.txt | 31 ++++++++++-------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/compiler-rt/lib/xray/CMakeLists.txt b/compiler-rt/lib/xray/CMakeLists.txt
index 101be97d2e3d..01f041d497a1 100644
--- a/compiler-rt/lib/xray/CMakeLists.txt
+++ b/compiler-rt/lib/xray/CMakeLists.txt
@@ -13,47 +13,38 @@ set(XRAY_SOURCES
 
 set(x86_64_SOURCES
     xray_x86_64.cc
-    xray_trampoline_x86_64.S
-    ${XRAY_SOURCES})
+    xray_trampoline_x86_64.S)
 
 set(arm_SOURCES
     xray_arm.cc
-    xray_trampoline_arm.S
-    ${XRAY_SOURCES})
+    xray_trampoline_arm.S)
 
-set(armhf_SOURCES
-  ${arm_SOURCES})
+set(armhf_SOURCES)
 
 set(aarch64_SOURCES
   xray_AArch64.cc
-  xray_trampoline_AArch64.S
-  ${XRAY_SOURCES})
+  xray_trampoline_AArch64.S)
 
 set(mips_SOURCES
     xray_mips.cc
-    xray_trampoline_mips.S
-    ${XRAY_SOURCES})
+    xray_trampoline_mips.S)
 
 set(mipsel_SOURCES
     xray_mips.cc
-    xray_trampoline_mips.S
-    ${XRAY_SOURCES})
+    xray_trampoline_mips.S)
 
 set(mips64_SOURCES
     xray_mips64.cc
-    xray_trampoline_mips64.S
-    ${XRAY_SOURCES})
+    xray_trampoline_mips64.S)
 
 set(mips64el_SOURCES
     xray_mips64.cc
-    xray_trampoline_mips64.S
-    ${XRAY_SOURCES})
+    xray_trampoline_mips64.S)
 
 set(powerpc64le_SOURCES
-        xray_powerpc64.cc
-        xray_trampoline_powerpc64.cc
-        xray_trampoline_powerpc64_asm.S
-        ${XRAY_SOURCES})
+    xray_powerpc64.cc
+    xray_trampoline_powerpc64.cc
+    xray_trampoline_powerpc64_asm.S)
 
 include_directories(..)
 include_directories(../../include)