Merge pull request #1765 from martin-frbg/issue1761
Do not use the new TLS-enabled memory allocator for non-threaded builds, and disable TLS by default in gmake as well
This commit is contained in:
commit
4d183e5567
|
@ -107,13 +107,13 @@ BUILD_LAPACK_DEPRECATED = 1
|
||||||
# BUILD_RELAPACK = 1
|
# BUILD_RELAPACK = 1
|
||||||
|
|
||||||
# If you want to use legacy threaded Level 3 implementation.
|
# If you want to use legacy threaded Level 3 implementation.
|
||||||
USE_SIMPLE_THREADED_LEVEL3 = 1
|
# USE_SIMPLE_THREADED_LEVEL3 = 1
|
||||||
|
|
||||||
# If you want to use the new, still somewhat experimental code that uses
|
# If you want to use the new, still somewhat experimental code that uses
|
||||||
# thread-local storage instead of a central memory buffer in memory.c
|
# thread-local storage instead of a central memory buffer in memory.c
|
||||||
# Note that if your system uses GLIBC, it needs to have at least glibc 2.21
|
# Note that if your system uses GLIBC, it needs to have at least glibc 2.21
|
||||||
# for this to work.
|
# for this to work.
|
||||||
USE_TLS = 1
|
# USE_TLS = 1
|
||||||
|
|
||||||
# If you want to drive whole 64bit region by BLAS. Not all Fortran
|
# If you want to drive whole 64bit region by BLAS. Not all Fortran
|
||||||
# compiler supports this. It's safe to keep comment it out if you
|
# compiler supports this. It's safe to keep comment it out if you
|
||||||
|
|
|
@ -73,8 +73,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
|
||||||
#if defined(USE_TLS)
|
#if defined(USE_TLS) && defined(SMP)
|
||||||
#define COMPILE_TLS
|
#define COMPILE_TLS
|
||||||
|
|
||||||
|
#if USE_TLS != 1
|
||||||
|
#undef COMPILE_TLS
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(__GLIBC_PREREQ)
|
#if defined(__GLIBC_PREREQ)
|
||||||
#if !__GLIBC_PREREQ(2,20)
|
#if !__GLIBC_PREREQ(2,20)
|
||||||
#undef COMPILE_TLS
|
#undef COMPILE_TLS
|
||||||
|
|
Loading…
Reference in New Issue