diff options
| author | Vladislav Vaintroub <vv221804@astra04> | 2010-02-14 14:32:27 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vv221804@astra04> | 2010-02-14 14:32:27 +0100 |
| commit | ace854390f6e5b345ef96a67f9bd837a4a96303f (patch) | |
| tree | fd0c7d88d397984da69d38a8faa0f27a121573aa /mysys/my_rdtsc.c | |
| parent | e3a4741d05138d3850c7ed1788e3065c2f34548b (diff) | |
| download | mariadb-git-ace854390f6e5b345ef96a67f9bd837a4a96303f.tar.gz | |
remove use of undocumented __sparcv8plus - this macro does not seem to be defined anymore with Sun Studio 12
Diffstat (limited to 'mysys/my_rdtsc.c')
| -rw-r--r-- | mysys/my_rdtsc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c index c2b31ee339d..073663e3d96 100644 --- a/mysys/my_rdtsc.c +++ b/mysys/my_rdtsc.c @@ -100,7 +100,7 @@ #if defined(__SUNPRO_CC) && defined(__sparcv9) && defined(_LP64) && !defined(__SunOS_5_7) extern "C" ulonglong my_timer_cycles_il_sparc64(); -#elif defined(__SUNPRO_CC) && defined(__sparcv8plus) && defined(_ILP32) && !defined(__SunOS_5_7) +#elif defined(__SUNPRO_CC) && defined(_ILP32) && !defined(__SunOS_5_7) extern "C" ulonglong my_timer_cycles_il_sparc32(); #elif defined(__SUNPRO_CC) && defined(__i386) && defined(_ILP32) extern "C" ulonglong my_timer_cycles_il_i386(); @@ -108,7 +108,7 @@ extern "C" ulonglong my_timer_cycles_il_i386(); extern "C" ulonglong my_timer_cycles_il_x86_64(); #elif defined(__SUNPRO_C) && defined(__sparcv9) && defined(_LP64) && !defined(__SunOS_5_7) ulonglong my_timer_cycles_il_sparc64(); -#elif defined(__SUNPRO_C) && defined(__sparcv8plus) && defined(_ILP32) && !defined(__SunOS_5_7) +#elif defined(__SUNPRO_C) && defined(_ILP32) && !defined(__SunOS_5_7) ulonglong my_timer_cycles_il_sparc32(); #elif defined(__SUNPRO_C) && defined(__i386) && defined(_ILP32) ulonglong my_timer_cycles_il_i386(); @@ -197,7 +197,7 @@ ulonglong my_timer_cycles(void) } #elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__sparcv9) && defined(_LP64) && !defined(__SunOS_5_7) return (my_timer_cycles_il_sparc64()); -#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__sparcv8plus) && defined(_ILP32) && !defined(__SunOS_5_7) +#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(_ILP32) && !defined(__SunOS_5_7) return (my_timer_cycles_il_sparc32()); #elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__i386) && defined(_ILP32) /* This is probably redundant for __SUNPRO_C. */ @@ -549,7 +549,7 @@ void my_timer_init(MY_TIMER_INFO *mti) mti->cycles.routine= MY_TIMER_ROUTINE_ASM_PPC; #elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__sparcv9) && defined(_LP64) && !defined(__SunOS_5_7) mti->cycles.routine= MY_TIMER_ROUTINE_ASM_SUNPRO_SPARC64; -#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__sparcv8plus) && defined(_ILP32) && !defined(__SunOS_5_7) +#elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(_ILP32) && !defined(__SunOS_5_7) mti->cycles.routine= MY_TIMER_ROUTINE_ASM_SUNPRO_SPARC32; #elif (defined(__SUNPRO_CC) || defined(__SUNPRO_C)) && defined(__i386) && defined(_ILP32) mti->cycles.routine= MY_TIMER_ROUTINE_ASM_SUNPRO_I386; |