We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Robust Clang and libc detection.

sdl-clang-libc-detection.patch (text/plain), 5.95 KB, created by vladius on 2021-02-10 09:00:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: vladius

Created: 2021-02-10 09:00:30 UTC

Size: 5.95 KB

patch

obsolete

># HG changeset patch
># User Vladislav Dmitrievich Turbanov <vladislav@turbanov.ru>
># Date 1612946425 -10800
>#      Wed Feb 10 11:40:25 2021 +0300
># Branch SDL-2.0-vladius
># Node ID 87f39d9a3a49ba1bf5711218e2766bc5d8635d29
># Parent  d8f0192cb8a4551e694e92e9e2d3b1e04a603b2b
>* Corrected Clang detection.
>* Libc defaults usage detection under Clang.
>
>diff -r d8f0192cb8a4 -r 87f39d9a3a49 CMakeLists.txt
>--- a/CMakeLists.txt	Tue Feb 09 15:10:06 2021 -0800
>+++ b/CMakeLists.txt	Wed Feb 10 11:40:25 2021 +0300
>@@ -159,16 +159,6 @@
>   set(SDL_PTHREADS_ENABLED_BY_DEFAULT OFF)
> endif()
> 
>-# Default option knobs
>-if(APPLE OR ARCH_64)
>-  if(NOT "${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm")
>-    set(OPT_DEF_SSEMATH ON)
>-  endif()
>-endif()
>-if(UNIX OR MINGW OR MSYS)
>-  set(OPT_DEF_LIBC ON)
>-endif()
>-
> # The hidraw support doesn't catch Xbox, PS4 and Nintendo controllers,
> #  so we'll just use libusb when it's available. libusb does not support iOS,
> #  so we default to yes on iOS.
>@@ -191,11 +181,11 @@
> endif()
> 
> # Compiler info
>-if(CMAKE_COMPILER_IS_GNUCC)
>-  set(USE_GCC TRUE)
>+if(CMAKE_C_COMPILER_ID MATCHES "Clang")
>+  set(USE_CLANG TRUE)
>   set(OPT_DEF_ASM TRUE)
>-elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
>-  set(USE_CLANG TRUE)
>+elseif(CMAKE_COMPILER_IS_GNUCC)
>+  set(USE_GCC TRUE)
>   set(OPT_DEF_ASM TRUE)
> elseif(MSVC_VERSION GREATER 1400) # VisualStudio 8.0+
>   set(OPT_DEF_ASM TRUE)
>@@ -208,6 +198,16 @@
>   set(OPT_DEF_GCC_ATOMICS ON)
> endif()
> 
>+# Default option knobs
>+if(APPLE OR ARCH_64)
>+  if(NOT "${CMAKE_OSX_ARCHITECTURES}" MATCHES "arm")
>+    set(OPT_DEF_SSEMATH ON)
>+  endif()
>+endif()
>+if(UNIX OR MINGW OR MSYS OR USE_CLANG)
>+  set(OPT_DEF_LIBC ON)
>+endif()
>+
> # Default flags, if not set otherwise
> if("$ENV{CFLAGS}" STREQUAL "")
>   if(CMAKE_BUILD_TYPE STREQUAL "")
>@@ -401,7 +401,6 @@
> option_string(FOREGROUNDING_SIGNAL "number to use for magic foregrounding signal or 'OFF'" "OFF")
> set_option(HIDAPI              "Use HIDAPI for low level joystick drivers" ${OPT_DEF_HIDAPI})
> set_option(JOYSTICK_VIRTUAL    "Enable the virtual-joystick driver" ON)
>-set_option(ASAN                "Use AddressSanitizer to detect memory errors" OFF)
> 
> set(SDL_SHARED ${SDL_SHARED_ENABLED_BY_DEFAULT} CACHE BOOL "Build a shared version of the library")
> set(SDL_STATIC ${SDL_STATIC_ENABLED_BY_DEFAULT} CACHE BOOL "Build a static version of the library")
>@@ -780,7 +779,7 @@
>     set(HAVE_SIGNAL_H 1)
>     foreach(_FN
>             malloc calloc realloc free qsort abs memset memcpy memmove memcmp
>-            wcslen _wcsdup wcsdup wcsstr wcscmp wcsncmp _wcsicmp _wcsnicmp
>+            wcslen wcsdup wcsstr wcscmp wcsncmp _wcsicmp _wcsnicmp
>             strlen _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa
>             _ultoa strtol strtoul strtoll strtod atoi atof strcmp strncmp
>             _stricmp _strnicmp sscanf
>@@ -819,10 +818,10 @@
>     foreach(_FN
>             strtod malloc calloc realloc free getenv setenv putenv unsetenv
>             qsort abs bcopy memset memcpy memmove memcmp strlen strlcpy strlcat
>-            _strrev _strupr _strlwr index rindex strchr strrchr strstr strtok_r
>-            itoa _ltoa _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull
>+            _strrev _strupr _strlwr strchr strrchr strstr strtok_r itoa _ltoa
>+            _uitoa _ultoa strtol strtoul _i64toa _ui64toa strtoll strtoull
>             atoi atof strcmp strncmp _stricmp strcasecmp _strnicmp strncasecmp
>-            wcscmp _wcsdup wcsdup wcslcat wcslcpy wcslen wcsncmp wcsstr
>+            wcscmp wcsdup wcslcat wcslcpy wcslen wcsncmp wcsstr
>             wcscasecmp _wcsicmp wcsncasecmp _wcsnicmp
>             sscanf vsscanf vsnprintf fopen64 fseeko fseeko64 _Exit
>             )
>@@ -2313,22 +2312,20 @@
>   endif()
> endif()
> 
>-macro(check_add_debug_flag FLAG SUFFIX)
>-    check_c_compiler_flag(${FLAG} HAS_C_FLAG_${SUFFIX})
>-    if (HAS_C_FLAG_${SUFFIX})
>+macro(asan_check_add_debug_flag ASAN_FLAG)
>+    set(FLAG "-fsanitize=${ASAN_FLAG}")
>+
>+    check_c_compiler_flag(${FLAG} HAS_C_FLAG_${ASAN_FLAG})
>+    if (HAS_C_FLAG_${ASAN_FLAG})
>         set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${FLAG}")
>     endif()
> 
>-    check_cxx_compiler_flag(${FLAG} HAS_CXX_${SUFFIX})
>-    if (HAS_CXX_${SUFFIX})
>+    check_cxx_compiler_flag("${FLAG}" HAS_CXX_${ASAN_FLAG})
>+    if (HAS_CXX_${ASAN_FLAG})
>         set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAG}")
>     endif()
> endmacro()
> 
>-macro(asan_check_add_debug_flag ASAN_FLAG)
>-    check_add_debug_flag("-fsanitize=${ASAN_FLAG}" "${ASAN_FLAG}")
>-endmacro()
>-
> macro(asan_check_add_debug_flag2 ASAN_FLAG)
>     # for some sanitize flags we have to manipulate the CMAKE_REQUIRED_LIBRARIES:
>     # http://cmake.3232098.n2.nabble.com/CHECK-CXX-COMPILER-FLAG-doesn-t-give-correct-result-for-fsanitize-address-tp7600216p7600217.html
>@@ -2351,21 +2348,19 @@
> endmacro()
> 
> # enable AddressSanitizer if supported
>-if (ASAN)
>-  asan_check_add_debug_flag2("address")
>-  asan_check_add_debug_flag("bool")
>-  asan_check_add_debug_flag("bounds")
>-  asan_check_add_debug_flag("enum")
>-  asan_check_add_debug_flag("float-cast-overflow")
>-  asan_check_add_debug_flag("float-divide-by-zero")
>-  asan_check_add_debug_flag("nonnull-attribute")
>-  asan_check_add_debug_flag("returns-nonnull-attribute")
>-  asan_check_add_debug_flag("signed-integer-overflow")
>-  asan_check_add_debug_flag("undefined")
>-  asan_check_add_debug_flag("vla-bound")
>-  asan_check_add_debug_flag("leak")
>-  asan_check_add_debug_flag("object-size")
>-endif()
>+asan_check_add_debug_flag2("address")
>+asan_check_add_debug_flag("bool")
>+asan_check_add_debug_flag("bounds")
>+asan_check_add_debug_flag("enum")
>+asan_check_add_debug_flag("float-cast-overflow")
>+asan_check_add_debug_flag("float-divide-by-zero")
>+asan_check_add_debug_flag("nonnull-attribute")
>+asan_check_add_debug_flag("returns-nonnull-attribute")
>+asan_check_add_debug_flag("signed-integer-overflow")
>+asan_check_add_debug_flag("undefined")
>+asan_check_add_debug_flag("vla-bound")
>+asan_check_add_debug_flag("leak")
>+asan_check_add_debug_flag("object-size")
> 
> ##### Tests #####
>

Actions: View | Diff

Attachments on bug 5542: 4789 | 4791

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.