From 33ee04626dcfd557dc38ad98e7077f025a9c946b Mon Sep 17 00:00:00 2001 From: comex Date: Sat, 19 Oct 2013 12:40:21 -0400 Subject: [PATCH] Don't define __rdtsc if x86intrin.h already does. --- Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp index acd8baa002..83022e390d 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64IL/JitIL.cpp @@ -149,6 +149,10 @@ ps_adds1 #else #include #include +#include + +#if defined(__clang__) +#if !__has_builtin(__builtin_ia32_rdtsc) static inline uint64_t __rdtsc() { uint32_t lo, hi; @@ -169,6 +173,8 @@ static inline uint64_t __rdtsc() return (uint64_t)hi << 32 | lo; } #endif +#endif +#endif namespace JitILProfiler {