diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-17 14:58:11 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-17 14:58:11 +0200 |
| commit | 2543673dd22782f59299fd2e72179601892bd967 (patch) | |
| tree | b73641bd88c9d1572203c75da618fce1937518e8 /mysys/my_rdtsc.c | |
| parent | 4e5b771e980edfdad5c5414aa62c81d409d585a4 (diff) | |
| parent | ef911553f442cbb1baaac2af44c38b54fd058c41 (diff) | |
| download | mariadb-git-2543673dd22782f59299fd2e72179601892bd967.tar.gz | |
Merge branch '11.0' into 11.1bb-11.1-release
Diffstat (limited to 'mysys/my_rdtsc.c')
| -rw-r--r-- | mysys/my_rdtsc.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c index ffd816024e5..e16825cedd2 100644 --- a/mysys/my_rdtsc.c +++ b/mysys/my_rdtsc.c @@ -368,29 +368,7 @@ void my_timer_init(MY_TIMER_INFO *mti) /* cycles */ mti->cycles.frequency= 1000000000; -#if defined _WIN32 || defined __i386__ || defined __x86_64__ - mti->cycles.routine= MY_TIMER_ROUTINE_RDTSC; -#elif defined(__INTEL_COMPILER) && defined(__ia64__) && defined(HAVE_IA64INTRIN_H) - mti->cycles.routine= MY_TIMER_ROUTINE_ASM_IA64; -#elif defined(__GNUC__) && defined(__ia64__) - mti->cycles.routine= MY_TIMER_ROUTINE_ASM_IA64; -#elif defined __GNUC__ && defined __powerpc__ - mti->cycles.routine= MY_TIMER_ROUTINE_PPC_GET_TIMEBASE; -#elif defined(__GNUC__) && defined(__sparcv9) && defined(_LP64) && (__GNUC__>2) - mti->cycles.routine= MY_TIMER_ROUTINE_ASM_GCC_SPARC64; -#elif defined(__GNUC__) && defined(__sparc__) && !defined(_LP64) && (__GNUC__>2) - mti->cycles.routine= MY_TIMER_ROUTINE_ASM_GCC_SPARC32; -#elif defined(__GNUC__) && defined(__s390__) - mti->cycles.routine= MY_TIMER_ROUTINE_ASM_S390; -#elif defined(__GNUC__) && defined (__aarch64__) - mti->cycles.routine= MY_TIMER_ROUTINE_AARCH64; -#elif defined(__GNUC__) && defined (__riscv) - mti->cycles.routine= MY_TIMER_ROUTINE_RISCV; -#elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) - mti->cycles.routine= MY_TIMER_ROUTINE_GETHRTIME; -#else - mti->cycles.routine= 0; -#endif + mti->cycles.routine= MY_TIMER_ROUTINE_CYCLES; if (!mti->cycles.routine || !my_timer_cycles()) { |