bb #9017: tomsfastmath warning with zLinux on s390x

Cisco-Talos · Oct 2, 2013 · a9d4067 · a9d4067
1 parent d9ce7a4
commit a9d4067
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep 30 11:04:58 2013 EDT 2013 (dar)
+------------------------------------
+ * bb #9017: tomsfastmath warning with zLinux on s390x
+
 Fri Sep 15 18:15:36 2013 EDT 2013 (morgan)
 ------------------------------------
  * win32: Import libxml2 2.9.1 components into windows builds for xmlReader support.

diff --git a/libclamav/bignum_fast.h b/libclamav/bignum_fast.h
@@ -7,6 +7,14 @@
  * 
  * Tom St Denis, tomstdenis@gmail.com
  */
+
+/* Oct 1, 2013
+ * Adding clamav-config.h include here for size-checking on fall-through case
+ */
+#if HAVE_CONFIG_H
+#include "clamav-config.h"
+#endif
+
 #ifndef TFM_H_
 #define TFM_H_
 
@@ -249,7 +257,13 @@
       typedef signed long long   long64;
    #endif
 #endif
-   typedef unsigned long      fp_digit;
+   /* The code requires that fp_word be twice the size of fp_digit.
+    * Add size-checking for special case (both long and long long are 64) */
+   #if (SIZEOF_LONG == 8) && (SIZEOF_LONG_LONG == 8)
+      typedef unsigned int       fp_digit;
+   #else
+      typedef unsigned long      fp_digit;
+   #endif
    typedef ulong64            fp_word;
 #endif