Merge 10.4 into 10.5

3 files changed, 5 insertions, 27 deletions

diff --git a/cmake/os/FreeBSD.cmake b/cmake/os/FreeBSD.cmake
index 9d3673aae86..e1c764692bc 100644
--- a/cmake/os/FreeBSD.cmake
+++ b/cmake/os/FreeBSD.cmake
@@ -28,7 +28,3 @@ SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and
 INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
 SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
 SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
-FIND_LIBRARY(EXECINFO NAMES execinfo)
-IF(EXECINFO)
- SET(LIBEXECINFO ${EXECINFO})
-ENDIF()
diff --git a/cmake/os/OpenBSD.cmake b/cmake/os/OpenBSD.cmake
deleted file mode 100644
index c8b91944275..00000000000
--- a/cmake/os/OpenBSD.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2012 Monty Program Ab, 2021 Brad Smith
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335  USA 
-
-# This file includes OpenBSD specific options and quirks, related to system checks
-
-# Find libexecinfo (library that contains backtrace_symbols etc)
-FIND_LIBRARY(EXECINFO NAMES execinfo)
-IF(EXECINFO)
- SET(LIBEXECINFO ${EXECINFO})
-ENDIF()
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake
index e2a4aa9e520..0310226c836 100644
--- a/cmake/os/WindowsCache.cmake
+++ b/cmake/os/WindowsCache.cmake
@@ -296,6 +296,11 @@ SET(HAVE_SOCKPEERCRED CACHE INTERNAL "")
 SET(HAVE_ABI_CXA_DEMANGLE CACHE INTERNAL "")
 SET(HAVE_GCC_C11_ATOMICS CACHE INTERNAL "")
 SET(HAVE_VISIBILITY_HIDDEN CACHE INTERNAL "")
+SET(HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC CACHE INTERNAL "")
+SET(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC CACHE INTERNAL "")
+SET(HAVE_MPROTECT CACHE INTERNAL "")
+SET(HAVE_C__Werror CACHE INTERNAL "")
+SET(HAVE_NANOSLEEP CACHE INTERNAL "")
 SET(HAVE_ACCEPT4 CACHE INTERNAL "")
 SET(HAVE_LINK_H CACHE  INTERNAL "")
 SET(HAVE_DLADDR CACHE INTERNAL "")
@@ -319,7 +324,6 @@ SET(HAVE_BZLIB2_DECOMPRESS CACHE INTERNAL "")
 SET(HAVE_BZLIB2_H CACHE INTERNAL "")
 SET(HAVE_SNAPPY_H CACHE INTERNAL "")
 SET(HAVE_SCHED_GETCPU CACHE INTERNAL "")
-SET(HAVE_NANOSLEEP CACHE INTERNAL "")
 SET(HAVE_PTHREAD_THREADID_NP CACHE INTERNAL "")
 SET(HAVE_SYS_GETTID CACHE INTERNAL "")
 SET(HAVE_GETTID CACHE INTERNAL "")