WT-2695 Fix build issues caused by zSeries checksum code (#2979)

wiredtiger · Aug 25, 2016 · f1ab6cc · f1ab6cc
1 parent 2ddc171
commit f1ab6cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/build_posix/configure.ac.in b/build_posix/configure.ac.in
@@ -59,9 +59,7 @@ AS_CASE([$host_cpu],
 	[wt_cv_powerpc="no"])
 AM_CONDITIONAL([POWERPC_HOST], [test "$wt_cv_powerpc" = "yes"])
 AS_CASE([$host_cpu],
-	[amd*], [wt_cv_x86="yes"],
-	[x86*], [wt_cv_x86="yes"],
-	[wt_cv_x86="no"])
+	[amd*|i[[3456]]86*|pentium|x86*], [wt_cv_x86="yes"], [wt_cv_x86="no"])
 AM_CONDITIONAL([X86_HOST], [test "$wt_cv_x86" = "yes"])
 AS_CASE([$host_cpu],
 	[s390x*], [wt_cv_zseries="yes"],

diff --git a/src/checksum/zseries/crc32-s390x.c b/src/checksum/zseries/crc32-s390x.c
@@ -12,7 +12,7 @@
 #include "slicing-consts.h"
 
 #define VX_MIN_LEN		64
-#define VX_ALIGNMENT		16L
+#define VX_ALIGNMENT		16UL
 #define VX_ALIGN_MASK		(VX_ALIGNMENT - 1)
 
 /* Prototypes for functions in assembly files */