From 896596f6725e3460c83cd33d924f9dc98101a4fe Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Sat, 20 Apr 2024 21:08:09 +0200
Subject: [PATCH] cmake update

---
 CMakeLists.txt             |  7 +++---
 misc/cmake/functions.cmake | 48 +++++++++++++++++++++++++-------------
 src/check/dt_cxxlib.cpp    |  4 ----
 src/check/dt_impl.cpp      |  2 +-
 4 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2892f547..c9c22829 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,10 +236,11 @@ if(NOT CMAKE_C_COMPILER_ID MATCHES "^MSVC")
     endif()
 endif()
 
-# examine MinGW/Cygwin compiler configuration
-if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/.git")
+# examine compiler configuration
+if(NOT UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO)
+    upx_print_common_symbols()
     upx_print_mingw_symbols()
-endif()
+endif() # UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO
 
 #***********************************************************************
 # targets
diff --git a/misc/cmake/functions.cmake b/misc/cmake/functions.cmake
index 62a5dcc2..e535932b 100644
--- a/misc/cmake/functions.cmake
+++ b/misc/cmake/functions.cmake
@@ -65,10 +65,38 @@ macro(upx_apply_build_type)
     endif()
 endmacro()
 
+# ternary conditional operator
+macro(upx_ternary result_var_name condition true_value false_value)
+    if(${condition})
+        set(${result_var_name} "${true_value}")
+    else()
+        set(${result_var_name} "${false_value}")
+    endif()
+endmacro()
+
 #***********************************************************************
 # util
 #***********************************************************************
 
+# convert to CMake bool
+function(upx_make_bool_var result_var_name var_name default_value)
+    set(result "${default_value}")
+    # only query $var_name if it is defined and not empty
+    if(NOT ",${var_name}," STREQUAL ",,")
+        if(DEFINED ${var_name})
+            if(NOT ",${${var_name}}," STREQUAL ",,")
+                set(result "${${var_name}}")
+            endif()
+        endif()
+    endif()
+    if(${result})
+        set(result ON)
+    else()
+        set(result OFF)
+    endif()
+    set(${result_var_name} "${result}" PARENT_SCOPE) # return value
+endfunction()
+
 function(upx_print_var) # ARGV
     foreach(var_name ${ARGV})
         if(DEFINED ${var_name})
@@ -101,22 +129,10 @@ function(upx_print_have_symbol) # ARGV; needs include(CheckSymbolExists)
     endforeach()
 endfunction()
 
-function(upx_make_bool_var result_var_name var_name default_value)
-    set(result "${default_value}")
-    if(NOT ",${var_name}," STREQUAL ",,")
-        if(DEFINED ${var_name})
-            if(NOT ",${${var_name}}," STREQUAL ",,")
-                set(result "${${var_name}}")
-            endif()
-        endif()
-    endif()
-    # convert to bool
-    if(${result})
-        set(result ON)
-    else()
-        set(result OFF)
-    endif()
-    set(${result_var_name} "${result}" PARENT_SCOPE) # return value
+# examine compiler configuration
+function(upx_print_common_symbols)
+    upx_print_have_symbol(__FAST_MATH__)
+    upx_print_have_symbol(__PIC__ __pic__ __PIE__ __pie__)
 endfunction()
 
 # examine MinGW/Cygwin compiler configuration
diff --git a/src/check/dt_cxxlib.cpp b/src/check/dt_cxxlib.cpp
index 9c46defb..188d0e42 100644
--- a/src/check/dt_cxxlib.cpp
+++ b/src/check/dt_cxxlib.cpp
@@ -366,10 +366,6 @@ struct TestTriBool {
         static_assert(alignof(typename T::value_type) == alignof(typename T::underlying_type));
 #if defined(__m68k__) && defined(__atarist__) && defined(__GNUC__)
         // broken compiler or broken ABI
-#elif defined(__i386__) && defined(__clang__) && (__clang_major__ < 9)
-        static_assert(sizeof(T) == sizeof(typename T::underlying_type));
-        // i386: "long long" enum align bug/ABI problem on older compilers
-        static_assert(alignof(T) <= alignof(typename T::underlying_type));
 #elif defined(__i386__) && defined(__GNUC__) && (__GNUC__ == 7) && !defined(__clang__)
         static_assert(sizeof(T) == sizeof(typename T::underlying_type));
         // i386: "long long" enum align bug/ABI problem on older compilers
diff --git a/src/check/dt_impl.cpp b/src/check/dt_impl.cpp
index ae757b18..4bce6662 100644
--- a/src/check/dt_impl.cpp
+++ b/src/check/dt_impl.cpp
@@ -55,7 +55,7 @@
 #endif
 #endif
 
-#if defined(__clang__) && defined(__FAST_MATH__)
+#if defined(__FAST_MATH__) && defined(__clang__) && (__clang_major__ + 0 >= 6)
 // warning: comparison with NaN always evaluates to false in fast floating point modes
 #pragma clang diagnostic ignored "-Wtautological-constant-compare"
 #endif