From c33a501c6fcc37a13d01f16b4f7d266aa9e6f522 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 16 Apr 2017 09:29:01 +0000 Subject: [PATCH] rebase of the patch --- debian/patches/disable-error-xray.diff | 38 ++------------------------ 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/debian/patches/disable-error-xray.diff b/debian/patches/disable-error-xray.diff index f867c8ac..2b77cf85 100644 --- a/debian/patches/disable-error-xray.diff +++ b/debian/patches/disable-error-xray.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_5.0~svn299813/compiler-rt/lib/xray/xray_tsc.h +Index: llvm-toolchain-snapshot_5.0~svn300419/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 +--- llvm-toolchain-snapshot_5.0~svn300419.orig/compiler-rt/lib/xray/xray_tsc.h ++++ llvm-toolchain-snapshot_5.0~svn300419/compiler-rt/lib/xray/xray_tsc.h @@ -61,8 +61,6 @@ inline uint64_t getTSCFrequency() XRAY_N } // namespace __xray @@ -11,35 +11,3 @@ Index: llvm-toolchain-snapshot_5.0~svn299813/compiler-rt/lib/xray/xray_tsc.h #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::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