d/p/disable-error-xray.diff: silent some xray error. See

https://bugs.llvm.org/show_bug.cgi?id=32582
This commit is contained in:
Sylvestre Ledru 2017-04-08 18:59:52 +00:00
parent f2acd6c154
commit 1480ac3b2e
3 changed files with 48 additions and 0 deletions

2
debian/changelog vendored
View File

@ -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)

45
debian/patches/disable-error-xray.diff vendored Normal file
View File

@ -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

View File

@ -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