Changeset: 8ba5c00dfc4c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ba5c00dfc4c
Modified Files:
CMakeLists.txt
gdk/gdk_calc_private.h
monetdb_config.h.in
Branch: cmake-fun
Log Message:
_mul128 function is only available on 64 bit MSVC.
diffs (38 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -184,9 +184,6 @@ elseif(MSVC)
set(restrict "__restrict") # C99 feature not present in MSVC
set(inline "__inline") # C99 feature only available on C++ compiler in
MSVC https://docs.microsoft.com/en-us/cpp/cpp/inline-functions-cpp?view=vs-2015
add_definitions(/D_CRT_SECURE_NO_WARNINGS) # TODO it would be nice to
remove this, but it requires lots of rewriting
- if(CMAKE_SIZEOF_VOID_P EQUAL 8) # Windows 64 bit
- set(HAVE__MUL128 ON CACHE INTERNAL "mul128 function is
available")
- endif()
endif()
# Tests for large files support
diff --git a/gdk/gdk_calc_private.h b/gdk/gdk_calc_private.h
--- a/gdk/gdk_calc_private.h
+++ b/gdk/gdk_calc_private.h
@@ -155,7 +155,7 @@
#define LNGMUL_CHECK(lft, rgt, dst, max, on_overflow) \
MULI4_WITH_CHECK(lft, rgt, lng, dst, max, hge, on_overflow)
#else
-#if defined(HAVE__MUL128)
+#if defined(_M_X64) /* 64 bit MSVC */
#include <intrin.h>
#pragma intrinsic(_mul128)
#define LNGMUL_CHECK(lft, rgt, dst, max, on_overflow) \
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -225,9 +225,6 @@
/* Define to 1 if you have valgrind installed and want to use it */
#cmakedefine HAVE_VALGRIND 1
-/* Define to 1 if you have the `_mul128' function. */
-#cmakedefine HAVE__MUL128 1
-
/* Define to 1 if you have the `__builtin_{add,sub,mul}_overflow' functions. */
#cmakedefine HAVE___BUILTIN_ADD_OVERFLOW 1
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
