diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-27 17:54:47 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-06-27 17:54:47 +0300 |
| commit | b7b0bc8f11c7cbbc690fa9b704ab3b0f62a77785 (patch) | |
| tree | b61eb8fc52031d2cd0cf2f05261dc5d80f7317fb /configure.cmake | |
| parent | bb702c2e4c24632678b548ee1515c6a5b8173808 (diff) | |
| parent | f5c080c7353cc9c30d0b269c07024cd38253c3bc (diff) | |
| download | mariadb-git-b7b0bc8f11c7cbbc690fa9b704ab3b0f62a77785.tar.gz | |
Merge 10.3 into 10.4
We omit the work-around commit 0b7fa5a05deecaf52207f00bb02b5c6b460abb11
because it appears to be needed for CentOS 6 only,
which we no longer support.
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/configure.cmake b/configure.cmake index 50900d10a6a..07cf752d495 100644 --- a/configure.cmake +++ b/configure.cmake @@ -753,32 +753,6 @@ IF(NOT C_HAS_inline) ENDIF() ENDIF() -IF(NOT CMAKE_CROSSCOMPILING AND NOT MSVC) - STRING(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} processor) - IF(processor MATCHES "86" OR processor MATCHES "amd64" OR processor MATCHES "x64") - #Check for x86 PAUSE instruction - # We have to actually try running the test program, because of a bug - # in Solaris on x86_64, where it wrongly reports that PAUSE is not - # supported when trying to run an application. See - # http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684 - CHECK_C_SOURCE_RUNS(" - int main() - { - __asm__ __volatile__ (\"pause\"); - return 0; - }" HAVE_PAUSE_INSTRUCTION) - ENDIF() - IF (NOT HAVE_PAUSE_INSTRUCTION) - CHECK_C_SOURCE_COMPILES(" - int main() - { - __asm__ __volatile__ (\"rep; nop\"); - return 0; - } - " HAVE_FAKE_PAUSE_INSTRUCTION) - ENDIF() -ENDIF() - CHECK_SYMBOL_EXISTS(tcgetattr "termios.h" HAVE_TCGETATTR 1) # |