diff options
author | Simon Dardis <simon.dardis@imgtec.com> | 2017-06-21 11:29:15 +0000 |
---|---|---|
committer | Simon Dardis <simon.dardis@imgtec.com> | 2017-06-21 11:29:15 +0000 |
commit | f62399945c7e8d16b8b87ed271c98133318a1e62 (patch) | |
tree | a2c0e897c1c38ad32b3f82e77cb00109efaef1ef | |
parent | 53dd644c5d623baf622a10ebefd121365ee98fbe (diff) | |
download | bcm5719-llvm-f62399945c7e8d16b8b87ed271c98133318a1e62.tar.gz bcm5719-llvm-f62399945c7e8d16b8b87ed271c98133318a1e62.zip |
[mips][compiler-rt] Fix build breakage.
Change some reinterpret_casts to c-style casts due to template instantiation
restrictions and build breakage due to missing paranthesises.
llvm-svn: 305899
-rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h | 3 | ||||
-rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang_other.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h b/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h index 47581282a78..65b3a38f0d5 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang.h @@ -82,8 +82,7 @@ INLINE bool atomic_compare_exchange_strong(volatile T *a, typename T::Type *cmp, if (sizeof(*a) == 8) { Type volatile *val_ptr = const_cast<Type volatile *>(&a->val_dont_use); prev = __mips_sync_val_compare_and_swap<u64>( - reinterpret_cast<u64 volatile *>(val_ptr), reinterpret_cast<u64> cmpv, - reinterpret_cast<u64> xchg); + reinterpret_cast<u64 volatile *>(val_ptr), (u64)cmpv, (u64)xchg); } else { prev = __sync_val_compare_and_swap(&a->val_dont_use, cmpv, xchg); } diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang_other.h b/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang_other.h index 2825c7400d9..d2acc311bf7 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang_other.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_atomic_clang_other.h @@ -145,8 +145,7 @@ INLINE void atomic_store(volatile T *a, typename T::Type v, memory_order mo) { typename T::Type volatile *val_ptr = const_cast<typename T::Type volatile *>(&a->val_dont_use); cur = __mips_sync_val_compare_and_swap<u64>( - reinterpret_cast<u64 volatile *>(val_ptr), reinterpret_cast<u64> cmp, - reinterpret_cast<u64> v); + reinterpret_cast<u64 volatile *>(val_ptr), (u64)cmp, (u64)v); #else cur = __sync_val_compare_and_swap(&a->val_dont_use, cmp, v); #endif |