From e7110971dd7e8076ee15aacc28e3e595244b36cc Mon Sep 17 00:00:00 2001
From: Yichao Yu <yyc1992@gmail.com>
Date: Thu, 18 Aug 2016 20:08:17 +0800
Subject: [PATCH] Fix compiler warnings on 32bits

---
 src/llvm-ptls.cpp     |  1 +
 src/support/hashing.h | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/llvm-ptls.cpp b/src/llvm-ptls.cpp
index 91d588243fcf5..f9567a3a5b007 100644
--- a/src/llvm-ptls.cpp
+++ b/src/llvm-ptls.cpp
@@ -147,6 +147,7 @@ void LowerPTLS::runOnFunction(LLVMContext &ctx, Module &M, Function *F,
         Value *tls = nullptr;
         assert(0 && "Cannot emit thread pointer for this architecture.");
 #  endif
+        (void)T_pint8;
         ptlsStates->replaceAllUsesWith(tls);
         ptlsStates->eraseFromParent();
     }
diff --git a/src/support/hashing.h b/src/support/hashing.h
index 1be2a9e7b5ec0..5f9b41d6f700d 100644
--- a/src/support/hashing.h
+++ b/src/support/hashing.h
@@ -3,6 +3,9 @@
 #ifndef HASHING_H
 #define HASHING_H
 
+#include "utils.h"
+#include "dtypes.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -22,10 +25,17 @@ JL_DLLEXPORT uint32_t memhash32(const char *buf, size_t n);
 JL_DLLEXPORT uint32_t memhash32_seed(const char *buf, size_t n, uint32_t seed);
 
 #ifdef _P64
-#define bitmix(a,b) int64hash((a)^bswap_64(b))
+STATIC_INLINE uint64_t bitmix(uint64_t a, uint64_t b)
+{
+    return int64hash(a^bswap_64(b));
+}
 #else
-#define bitmix(a,b) int64to32hash((((uint64_t)a)<<32)|((uint64_t)b))
+STATIC_INLINE uint32_t bitmix(uint32_t a, uint32_t b)
+{
+    return int64to32hash((((uint64_t)a) << 32) | (uint64_t)b);
+}
 #endif
+#define bitmix(a, b) (bitmix)((uintptr_t)(a), (uintptr_t)(b))
 
 #ifdef __cplusplus
 }