[compiler-rt] 997f17b - Fix detecting Windows 64bit, ignoring 32bit for now.

[Russell Gallop via llvm-commits]

Author: Russell Gallop
Date: 2021-01-21T16:54:40Z
New Revision: 997f17b14ce7b082b14086d442b833f9a320cdfb

URL: https://github.com/llvm/llvm-project/commit/997f17b14ce7b082b14086d442b833f9a320cdfb
DIFF: https://github.com/llvm/llvm-project/commit/997f17b14ce7b082b14086d442b833f9a320cdfb.diff

LOG: Fix detecting Windows 64bit, ignoring 32bit for now.

Should probably determine whether we are supporting 64bit in cmake and
only build standalone if we are.

Added: 
    

Modified: 
    compiler-rt/lib/scudo/standalone/platform.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/scudo/standalone/platform.h b/compiler-rt/lib/scudo/standalone/platform.h
index 682d94d38041..cb4e71b14ec3 100644
--- a/compiler-rt/lib/scudo/standalone/platform.h
+++ b/compiler-rt/lib/scudo/standalone/platform.h
@@ -31,13 +31,13 @@
 #define SCUDO_FUCHSIA 0
 #endif
 
-#if defined(__WIN32__)
+#if defined(_WIN64)
 #define SCUDO_WINDOWS 1
 #else
 #define SCUDO_WINDOWS 0
 #endif
 
-#if __LP64__
+#if defined(_WIN64) or __LP64__
 #define SCUDO_WORDSIZE 64U
 #else
 #define SCUDO_WORDSIZE 32U