From 1480ac3b2e72300336b69f48a52d5fd91c53f9cc Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 8 Apr 2017 18:59:52 +0000
Subject: [PATCH] d/p/disable-error-xray.diff: silent some xray error. See
 https://bugs.llvm.org/show_bug.cgi?id=32582

---
 debian/changelog                       |  2 ++
 debian/patches/disable-error-xray.diff | 45 ++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 48 insertions(+)
 create mode 100644 debian/patches/disable-error-xray.diff

diff --git a/debian/changelog b/debian/changelog
index 5a480e19..c92b68ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ llvm-toolchain-snapshot (1:5.0~svn298832-1~exp1) experimental; urgency=medium
   * Explicit the dep of clang-tidy on same version of llvm to avoid
     undefined symbols
   * Silent some amdgpu test https://bugs.llvm.org//show_bug.cgi?id=32483
+  * d/p/disable-error-xray.diff: silent some xray error. See
+    https://bugs.llvm.org/show_bug.cgi?id=32582
 
   [ Rebecca N. Palmer ]
   * Use versioned symbols (Closes: #848368)
diff --git a/debian/patches/disable-error-xray.diff b/debian/patches/disable-error-xray.diff
new file mode 100644
index 00000000..f867c8ac
--- /dev/null
+++ b/debian/patches/disable-error-xray.diff
@@ -0,0 +1,45 @@
+Index: llvm-toolchain-snapshot_5.0~svn299813/compiler-rt/lib/xray/xray_tsc.h
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn299813.orig/compiler-rt/lib/xray/xray_tsc.h
++++ llvm-toolchain-snapshot_5.0~svn299813/compiler-rt/lib/xray/xray_tsc.h
+@@ -61,8 +61,6 @@ inline uint64_t getTSCFrequency() XRAY_N
+ 
+ } // namespace __xray
+ 
+-#else
+-#error Target architecture is not supported.
+ #endif // CPU architecture
+ 
+ #endif // XRAY_EMULATE_TSC_H
+Index: llvm-toolchain-snapshot_5.0~svn299813/compiler-rt/lib/xray/xray_fdr_logging_impl.h
+===================================================================
+--- llvm-toolchain-snapshot_5.0~svn299813.orig/compiler-rt/lib/xray/xray_fdr_logging_impl.h
++++ llvm-toolchain-snapshot_5.0~svn299813/compiler-rt/lib/xray/xray_fdr_logging_impl.h
+@@ -423,11 +423,11 @@ static inline void processFunctionHook(
+       return;
+     }
+ 
+-    uint64_t CycleFrequency = getTSCFrequency();
++/*    uint64_t CycleFrequency = getTSCFrequency();
+     NumberOfTicksThreshold = CycleFrequency *
+                              flags()->xray_fdr_log_func_duration_threshold_us /
+                              1000000;
+-    setupNewBuffer(Buffer, wall_clock_reader);
++                             setupNewBuffer(Buffer, wall_clock_reader);*/
+   }
+ 
+   if (CurrentCPU == std::numeric_limits<uint16_t>::max()) {
+@@ -489,11 +489,11 @@ static inline void processFunctionHook(
+              BufferQueue::getErrorString(EC));
+       return;
+     }
+-    uint64_t CycleFrequency = getTSCFrequency();
++/*    uint64_t CycleFrequency = getTSCFrequency();
+     NumberOfTicksThreshold = CycleFrequency *
+                              flags()->xray_fdr_log_func_duration_threshold_us /
+                              1000000;
+-    setupNewBuffer(Buffer, wall_clock_reader);
++                             setupNewBuffer(Buffer, wall_clock_reader);*/
+   }
+ 
+   // By this point, we are now ready to write at most 24 bytes (one metadata
diff --git a/debian/patches/series b/debian/patches/series
index 3f219be7..6a63d397 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,3 +46,4 @@ silent-test-failing-codeverage.diff
 disable-path-test-failing.diff
 add_symbols_versioning.patch
 silent-amd-tet.diff
+disable-error-xray.diff