From a25c7dc501a3ef57f832e16faa8c7b05d7412993 Mon Sep 17 00:00:00 2001 From: "Bradley C. Kuszmaul" <bradley@tokutek.com> Date: Tue, 16 Apr 2013 23:57:21 -0400 Subject: [PATCH] Make it work better with icc. Addresses #1185. git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6468 c7de825b-a66e-492c-adef-691d508d4ae1 --- include/rdtsc.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/rdtsc.h b/include/rdtsc.h index 1cc9c2dcff3..acc5b6da09e 100644 --- a/include/rdtsc.h +++ b/include/rdtsc.h @@ -1,6 +1,11 @@ // read the processor time stamp register -#if defined __i386__ +#if defined __ICC + +#define USE_RDTSC 1 +#define rdtsc _rdtsc + +#elif defined __i386__ #define USE_RDTSC 1 @@ -12,8 +17,7 @@ static inline unsigned long long rdtsc() { return ((unsigned long long) hi << 32ULL) + (unsigned long long) lo; } -#else -#if defined __x86_64__ +#elif defined __x86_64__ #define USE_RDTSC 1 @@ -26,9 +30,6 @@ static inline unsigned long long rdtsc() { return r; } -#else - #define USE_RDTSC 0 #endif -#endif