1 files changed, 54 insertions, 34 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c496ad9..8437e02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ if(MSVC)
         cmake_policy(SET CMP0091 NEW)
 endif()
 
-project (LibreSSL C ASM)
+project(LibreSSL LANGUAGES C ASM)
 
 include(CheckFunctionExists)
 include(CheckSymbolExists)
@@ -72,10 +72,6 @@ endforeach()
 
 set(BUILD_NC true)
 
-if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-        add_definitions(-fno-common)
-endif()
-
 if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
         add_definitions(-DHAVE_ATTRIBUTE__BOUNDED__)
         add_definitions(-DHAVE_ATTRIBUTE__DEAD__)
@@ -89,6 +85,10 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
         set(PLATFORM_LIBS ${PLATFORM_LIBS} pthread)
 endif()
 
+if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+        set(PLATFORM_LIBS ${PLATFORM_LIBS} pthread)
+endif()
+
 if(WIN32)
         set(BUILD_NC false)
         if(MINGW)
@@ -127,7 +127,7 @@ add_definitions(-D__END_HIDDEN_DECLS=)
 set(CMAKE_POSITION_INDEPENDENT_CODE true)
 
 if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-        add_definitions(-Wno-pointer-sign)
+        add_compile_options(-Wno-pointer-sign)
 endif()
 
 if(WIN32)
@@ -158,17 +158,21 @@ if(MSVC)
                 set(MSVC_DISABLED_WARNINGS_LIST
                         "C4018" # 'expression' : signed/unsigned mismatch
                         "C4057" # 'operator' : 'identifier1' indirection to
-                                # slightly different base types from 'identifier2'
+                                # slightly different base types from 'identifier2'
                         "C4100" # 'identifier' : unreferenced formal parameter
                         "C4127" # conditional expression is constant
+                        "C4132" # 'object' : const object should be initialized
                         "C4146" # unary minus operator applied to unsigned type,
                                 # result still unsigned
+                        "C4206" # nonstandard extension used : translation unit is empty
                         "C4244" # 'argument' : conversion from 'type1' to 'type2',
                                 # possible loss of data
                         "C4245" # 'conversion' : conversion from 'type1' to 'type2',
                                 # signed/unsigned mismatch
                         "C4267" # 'var' : conversion from 'size_t' to 'type',
                                 # possible loss of data
+                        "C4295" # 'array' : array is too small to include a terminating
+                                # null character
                         "C4389" # 'operator' : signed/unsigned mismatch
                         "C4706" # assignment within conditional expression
                         "C4996" # The POSIX name for this item is deprecated.
@@ -200,21 +204,33 @@ else()
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 endif()
 
+# XXX - needs _GNU_SOURCE on linux
 check_function_exists(asprintf HAVE_ASPRINTF)
 if(HAVE_ASPRINTF)
         add_definitions(-DHAVE_ASPRINTF)
 endif()
 
-check_function_exists(getopt HAVE_GETOPT)
+check_symbol_exists(getdelim "stdio.h" HAVE_GETDELIM)
+if(HAVE_GETDELIM)
+        add_definitions(-DHAVE_GETDELIM)
+endif()
+
+check_symbol_exists(getline "stdio.h" HAVE_GETLINE)
+if(HAVE_GETLINE)
+        add_definitions(-DHAVE_GETLINE)
+endif()
+
+check_symbol_exists(getopt "unistd.h" HAVE_GETOPT)
 if(HAVE_GETOPT)
         add_definitions(-DHAVE_GETOPT)
 endif()
 
-check_function_exists(reallocarray HAVE_REALLOCARRAY)
+check_symbol_exists(reallocarray "stdlib.h" HAVE_REALLOCARRAY)
 if(HAVE_REALLOCARRAY)
         add_definitions(-DHAVE_REALLOCARRAY)
 endif()
 
+# XXX strcasecmp() is in strings.h which isn't available everywhere
 check_function_exists(strcasecmp HAVE_STRCASECMP)
 if(HAVE_STRCASECMP)
         add_definitions(-DHAVE_STRCASECMP)
@@ -222,18 +238,18 @@ endif()
 
 # Emscripten's strlcat and strlcpy triggers ASAN errors
 if(NOT EMSCRIPTEN)
-        check_function_exists(strlcat HAVE_STRLCAT)
+        check_symbol_exists(strlcat "string.h" HAVE_STRLCAT)
         if(HAVE_STRLCAT)
                 add_definitions(-DHAVE_STRLCAT)
         endif()
 
-        check_function_exists(strlcpy HAVE_STRLCPY)
+        check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)
         if(HAVE_STRLCPY)
                 add_definitions(-DHAVE_STRLCPY)
         endif()
 endif()
 
-check_function_exists(strndup HAVE_STRNDUP)
+check_symbol_exists(strndup "string.h" HAVE_STRNDUP)
 if(HAVE_STRNDUP)
         add_definitions(-DHAVE_STRNDUP)
 endif()
@@ -242,62 +258,64 @@ if(WIN32)
         set(HAVE_STRNLEN true)
         add_definitions(-DHAVE_STRNLEN)
 else()
-        check_function_exists(strnlen HAVE_STRNLEN)
+        check_symbol_exists(strnlen "string.h" HAVE_STRNLEN)
         if(HAVE_STRNLEN)
                 add_definitions(-DHAVE_STRNLEN)
         endif()
 endif()
 
-check_function_exists(strsep HAVE_STRSEP)
+check_symbol_exists(strsep "string.h" HAVE_STRSEP)
 if(HAVE_STRSEP)
         add_definitions(-DHAVE_STRSEP)
 endif()
 
-check_function_exists(strtonum HAVE_STRTONUM)
+check_symbol_exists(strtonum "stdlib.h" HAVE_STRTONUM)
 if(HAVE_STRTONUM)
         add_definitions(-DHAVE_STRTONUM)
 endif()
 
-check_function_exists(arc4random_buf HAVE_ARC4RANDOM_BUF)
+check_symbol_exists(arc4random_buf "stdlib.h" HAVE_ARC4RANDOM_BUF)
 if(HAVE_ARC4RANDOM_BUF)
         add_definitions(-DHAVE_ARC4RANDOM_BUF)
 endif()
 
-check_function_exists(arc4random_uniform HAVE_ARC4RANDOM_UNIFORM)
+check_symbol_exists(arc4random_uniform "stdlib.h" HAVE_ARC4RANDOM_UNIFORM)
 if(HAVE_ARC4RANDOM_UNIFORM)
         add_definitions(-DHAVE_ARC4RANDOM_UNIFORM)
 endif()
 
-check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO)
+check_symbol_exists(explicit_bzero "string.h" HAVE_EXPLICIT_BZERO)
 if(HAVE_EXPLICIT_BZERO)
         add_definitions(-DHAVE_EXPLICIT_BZERO)
 endif()
 
-check_function_exists(getauxval HAVE_GETAUXVAL)
+check_symbol_exists(getauxval "sys/auxv.h" HAVE_GETAUXVAL)
 if(HAVE_GETAUXVAL)
         add_definitions(-DHAVE_GETAUXVAL)
 endif()
 
+# XXX macos fails to find getentropy with check_symbol_exists()
 check_function_exists(getentropy HAVE_GETENTROPY)
 if(HAVE_GETENTROPY)
         add_definitions(-DHAVE_GETENTROPY)
 endif()
 
-check_symbol_exists(getpagesize unistd.h HAVE_GETPAGESIZE)
+check_symbol_exists(getpagesize "unistd.h" HAVE_GETPAGESIZE)
 if(HAVE_GETPAGESIZE)
         add_definitions(-DHAVE_GETPAGESIZE)
 endif()
 
-check_function_exists(getprogname HAVE_GETPROGNAME)
+check_symbol_exists(getprogname "stdlib.h" HAVE_GETPROGNAME)
 if(HAVE_GETPROGNAME)
         add_definitions(-DHAVE_GETPROGNAME)
 endif()
 
-check_function_exists(syslog_r HAVE_SYSLOG_R)
+check_symbol_exists(syslog_r "syslog.h;stdarg.h" HAVE_SYSLOG_R)
 if(HAVE_SYSLOG_R)
         add_definitions(-DHAVE_SYSLOG_R)
 endif()
 
+# XXX - needs _GNU_SOURCE on linux
 check_function_exists(syslog HAVE_SYSLOG)
 if(HAVE_SYSLOG)
         add_definitions(-DHAVE_SYSLOG)
@@ -308,16 +326,17 @@ if(HAVE_TIMESPECSUB)
         add_definitions(-DHAVE_TIMESPECSUB)
 endif()
 
-check_function_exists(timingsafe_bcmp HAVE_TIMINGSAFE_BCMP)
+check_symbol_exists(timingsafe_bcmp "string.h" HAVE_TIMINGSAFE_BCMP)
 if(HAVE_TIMINGSAFE_BCMP)
         add_definitions(-DHAVE_TIMINGSAFE_BCMP)
 endif()
 
-check_function_exists(timingsafe_memcmp HAVE_TIMINGSAFE_MEMCMP)
+check_symbol_exists(timingsafe_memcmp "string.h" HAVE_TIMINGSAFE_MEMCMP)
 if(HAVE_TIMINGSAFE_MEMCMP)
         add_definitions(-DHAVE_TIMINGSAFE_MEMCMP)
 endif()
 
+# XXX - needs _GNU_SOURCE on linux
 check_function_exists(memmem HAVE_MEMMEM)
 if(HAVE_MEMMEM)
         add_definitions(-DHAVE_MEMMEM)
@@ -366,6 +385,8 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|amd64|AMD64)")
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|[xX]86)")
         set(ENABLE_ASM false)
         set(HOST_I386 true)
+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "loongarch64")
+        set(HOST_LOONGARCH64 true)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips64")
         set(HOST_MIPS64 true)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips")
@@ -373,7 +394,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips")
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc")
         set(HOST_POWERPC true)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64")
-        set(HOST_PPC64 true)
+        set(HOST_POWERPC64 true)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64")
         set(HOST_RISCV64 true)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64")
@@ -384,21 +405,20 @@ endif()
 
 if(ENABLE_ASM)
         if(CMAKE_C_COMPILER_ABI STREQUAL "ELF")
-                if(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|amd64)")
+                if(HOST_X86_64)
                         set(HOST_ASM_ELF_X86_64 true)
-                elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm" AND
-                       NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
+                elseif(HOST_ARM)
                         set(HOST_ASM_ELF_ARMV4 true)
-                elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
+                elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND HOST_I386)
                         set(HOST_ASM_ELF_X86_64 true)
                 endif()
                 add_definitions(-DHAVE_GNU_STACK)
-        elseif(APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+        elseif(APPLE AND HOST_X86_64)
                 set(HOST_ASM_MACOSX_X86_64 true)
         elseif(MSVC AND (CMAKE_GENERATOR MATCHES "Win64" OR CMAKE_GENERATOR_PLATFORM STREQUAL "x64"))
                 set(HOST_ASM_MASM_X86_64 true)
                 ENABLE_LANGUAGE(ASM_MASM)
-        elseif(MINGW AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+        elseif(MINGW AND HOST_X86_64)
                 set(HOST_ASM_MINGW64_X86_64 true)
         endif()
 endif()
@@ -441,10 +461,10 @@ if(OPENSSLDIR STREQUAL "")
         if(WIN32)
                 set(OPENSSLDIR "C:/Windows/libressl/ssl")
         else()
-                set(OPENSSLDIR "${CMAKE_INSTALL_PREFIX}/etc/ssl")
+                set(OPENSSLDIR "${CMAKE_INSTALL_SYSCONFDIR}/ssl")
         endif()
 
-        set(CONF_DIR "${CMAKE_INSTALL_PREFIX}/etc/ssl")
+        set(CONF_DIR "${CMAKE_INSTALL_SYSCONFDIR}/ssl")
 else()
         set(CONF_DIR "${OPENSSLDIR}")
 endif()
@@ -513,7 +533,7 @@ if(ENABLE_LIBRESSL_INSTALL)
                 set(prefix      ${CMAKE_INSTALL_PREFIX})
                 set(exec_prefix \${prefix})
                 set(libdir      \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
-                set(includedir  \${prefix}/include)
+                set(includedir  \${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
                 if(PLATFORM_LIBS)
                         string(REGEX REPLACE ";" " -l" PLATFORM_LDADD ";${PLATFORM_LIBS}")
                 endif()