diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 18:57:00 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-13 18:57:00 +0300 |
| commit | 624dd71b9419555eca8baadc695e3376de72286f (patch) | |
| tree | 31aaab8aeac43f921638407ab82190dd05a72793 /cmake/os | |
| parent | d4d865fcc8083782b6e4419c69bec372cd0b4142 (diff) | |
| parent | e9c1701e11e2441435223cc7c00c467f58aaff19 (diff) | |
| download | mariadb-git-624dd71b9419555eca8baadc695e3376de72286f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'cmake/os')
| -rw-r--r-- | cmake/os/SunOS.cmake | 2 | ||||
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/cmake/os/SunOS.cmake b/cmake/os/SunOS.cmake index 4a77b53fb31..27daf2dff1c 100644 --- a/cmake/os/SunOS.cmake +++ b/cmake/os/SunOS.cmake @@ -70,7 +70,7 @@ CHECK_C_SOURCE_RUNS( # Check is special processor flag needs to be set on older GCC -#that defaults to v8 sparc . Code here is taken from my_rdtsc.c +#that defaults to v8 sparc . Code here is taken from my_rdtsc.h IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SIZEOF_VOID_P EQUAL 4 AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc") SET(SOURCE diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index 0508ebcba84..4ba36dc494d 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -25,7 +25,6 @@ SET(HAVE_ACCESS 1 CACHE INTERNAL "") SET(HAVE_ALARM CACHE INTERNAL "") SET(HAVE_ALLOCA_H CACHE INTERNAL "") SET(HAVE_ARPA_INET_H CACHE INTERNAL "") -SET(HAVE_ASM_MSR_H CACHE INTERNAL "") SET(HAVE_BACKTRACE CACHE INTERNAL "") SET(HAVE_BACKTRACE_SYMBOLS CACHE INTERNAL "") SET(HAVE_BACKTRACE_SYMBOLS_FD CACHE INTERNAL "") @@ -132,7 +131,6 @@ SET(HAVE_PTHREAD_YIELD_NP CACHE INTERNAL "") SET(HAVE_PTHREAD_YIELD_ZERO_ARG CACHE INTERNAL "") SET(HAVE_PUTENV 1 CACHE INTERNAL "") SET(HAVE_PWD_H CACHE INTERNAL "") -SET(HAVE_RDTSCLL CACHE INTERNAL "") SET(HAVE_READDIR_R CACHE INTERNAL "") SET(HAVE_READLINK CACHE INTERNAL "") SET(HAVE_READ_REAL_TIME CACHE INTERNAL "") @@ -301,7 +299,6 @@ SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "") SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "") SET(HAVE_SOCKPEERCRED CACHE INTERNAL "") SET(HAVE_ABI_CXA_DEMANGLE CACHE INTERNAL "") -SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "") SET(HAVE_GCC_C11_ATOMICS CACHE INTERNAL "") SET(HAVE_VISIBILITY_HIDDEN CACHE INTERNAL "") ENDIF(MSVC) |