Land #1332 - fix a few things on solaris

3 files changed, 8 insertions, 3 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a23b98..699603b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,6 +129,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
 endif()
 
 if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+        set(SOLARIS TRUE)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -fno-strict-aliasing")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__EXTENSIONS__")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600")
@@ -419,7 +420,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
         if(APPLE)
                 set(ENABLE_ASM false)
         endif()
-elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
+elseif(SOLARIS AND CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
         set(HOST_X86_64 true)
 elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|x64|amd64|AMD64)")
         set(HOST_X86_64 true)
@@ -448,7 +449,7 @@ if(ENABLE_ASM)
         if(CMAKE_C_COMPILER_ABI STREQUAL "ELF")
                 if(HOST_X86_64)
                         set(HOST_ASM_ELF_X86_64 true)
-                elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND HOST_I386)
+                elseif(SOLARIS AND HOST_I386)
                         set(HOST_ASM_ELF_X86_64 true)
                 endif()
                 add_definitions(-DHAVE_GNU_STACK)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 20d2faa..b1a1487 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -284,7 +284,8 @@ target_link_libraries(bn_mont ${OPENSSL_TEST_LIBS})
 add_platform_test(bn_mont bn_mont)
 
 # bn_mul_div
-if(NOT (WIN32 OR EMSCRIPTEN))
+# The benchmark code uses TIMEVAL_TO_TIMESPEC, which is unavailable on Solaris.
+if(NOT (WIN32 OR EMSCRIPTEN OR SOLARIS))
         add_executable(bn_mul_div bn_mul_div.c)
         target_link_libraries(bn_mul_div ${OPENSSL_TEST_LIBS})
         add_platform_test(bn_mul_div bn_mul_div)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a029d4a..d0b3adf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -308,11 +308,14 @@ check_PROGRAMS += bn_mont
 bn_mont_SOURCES = bn_mont.c
 
 # bn_mul_div
+# The benchmark code uses TIMEVAL_TO_TIMESPEC, which is unavailable on Solaris.
 if !HOST_WIN
+if !HOST_SOLARIS
 TESTS += bn_mul_div
 check_PROGRAMS += bn_mul_div
 bn_mul_div_SOURCES = bn_mul_div.c
 endif
+endif
 
 # bn_primes
 TESTS += bn_primes