From e695db0f2d97cbba2832e0f3dc25af5add1f16ac Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 12 Jan 2015 17:03:45 +0100 Subject: MDEV-7437 remove suport for "atomics" with rwlocks --- configure.cmake | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'configure.cmake') diff --git a/configure.cmake b/configure.cmake index 5fb86acad70..e0dc4be2783 100644 --- a/configure.cmake +++ b/configure.cmake @@ -964,8 +964,6 @@ MARK_AS_ADVANCED(NO_ALARM) IF(CMAKE_COMPILER_IS_GNUCXX) IF(WITH_ATOMIC_OPS STREQUAL "up") SET(MY_ATOMIC_MODE_DUMMY 1 CACHE BOOL "Assume single-CPU mode, no concurrency") -ELSEIF(WITH_ATOMIC_OPS STREQUAL "rwlocks") - SET(MY_ATOMIC_MODE_RWLOCKS 1 CACHE BOOL "Use pthread rwlocks for atomic ops") ELSEIF(WITH_ATOMIC_OPS STREQUAL "smp") ELSEIF(NOT WITH_ATOMIC_OPS) CHECK_CXX_SOURCE_COMPILES(" @@ -997,12 +995,8 @@ ELSE() ENDIF() ENDIF() -SET(WITH_ATOMIC_OPS "${WITH_ATOMIC_OPS}" CACHE STRING - "Implement atomic operations using pthread rwlocks (rwlocks); or atomic CPU -instructions for multi-processor (smp) or uniprocessor (up) -configuration. By default gcc built-in sync functions are used, -if available and 'smp' configuration otherwise.") -MARK_AS_ADVANCED(WITH_ATOMIC_OPS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY) +SET(WITH_ATOMIC_OPS "${WITH_ATOMIC_OPS}" CACHE STRING "Implement atomic operations using atomic CPU instructions for multi-processor (smp) or uniprocessor (up) configuration. By default gcc built-in sync functions are used, if available and 'smp' configuration otherwise.") +MARK_AS_ADVANCED(WITH_ATOMIC_OPS MY_ATOMIC_MODE_DUMMY) IF(WITH_VALGRIND) SET(HAVE_valgrind 1) -- cgit v1.2.1