From: Aaron Ballman <aaron@aaronballman.com>
Date: Wed, 16 Jan 2013 23:17:21 +0000 (+0000)
Subject: Wrapping __popcnt64 for MSVC so that it's only used on 64-bit builds.
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=69877d6db907be210696282c9f9f41f977c844d2;p=oota-llvm.git

Wrapping __popcnt64 for MSVC so that it's only used on 64-bit builds.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@172670 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Support/MathExtras.h b/include/llvm/Support/MathExtras.h
index eaab8abe076..b8631a56970 100644
--- a/include/llvm/Support/MathExtras.h
+++ b/include/llvm/Support/MathExtras.h
@@ -317,7 +317,7 @@ inline unsigned CountPopulation_32(uint32_t Value) {
 inline unsigned CountPopulation_64(uint64_t Value) {
 #if __GNUC__ >= 4
   return __builtin_popcountll(Value);
-#elif defined(_MSC_VER)
+#elif defined(_MSC_VER) && defined(_M_X64)
   return __popcnt64(Value);
 #else
   uint64_t v = Value - ((Value >> 1) & 0x5555555555555555ULL);