diff --git a/compiler-rt/lib/ubsan/ubsan_diag.cc b/compiler-rt/lib/ubsan/ubsan_diag.cc
index 809554204899..05d81320c27f 100644
--- a/compiler-rt/lib/ubsan/ubsan_diag.cc
+++ b/compiler-rt/lib/ubsan/ubsan_diag.cc
@@ -36,7 +36,7 @@ Diag &Diag::operator<<(const Value &V) {
 
 /// Hexadecimal printing for numbers too large for fprintf to handle directly.
 static void PrintHex(UIntMax Val) {
-#ifdef HAVE_INT128_T
+#if HAVE_INT128_T
   fprintf(stderr, "0x%08x%08x%08x%08x",
           (unsigned int)(Val >> 96),
           (unsigned int)(Val >> 64),
diff --git a/compiler-rt/lib/ubsan/ubsan_value.cc b/compiler-rt/lib/ubsan/ubsan_value.cc
index 0b368953e124..3d6a73548f41 100644
--- a/compiler-rt/lib/ubsan/ubsan_value.cc
+++ b/compiler-rt/lib/ubsan/ubsan_value.cc
@@ -27,7 +27,7 @@ SIntMax Value::getSIntValue() const {
   }
   if (getType().getIntegerBitWidth() == 64)
     return *reinterpret_cast<s64*>(Val);
-#ifdef HAVE_INT128_T
+#if HAVE_INT128_T
   if (getType().getIntegerBitWidth() == 128)
     return *reinterpret_cast<s128*>(Val);
 #endif
@@ -40,7 +40,7 @@ UIntMax Value::getUIntValue() const {
     return Val;
   if (getType().getIntegerBitWidth() == 64)
     return *reinterpret_cast<u64*>(Val);
-#ifdef HAVE_INT128_T
+#if HAVE_INT128_T
   if (getType().getIntegerBitWidth() == 128)
     return *reinterpret_cast<u128*>(Val);
 #endif
diff --git a/compiler-rt/lib/ubsan/ubsan_value.h b/compiler-rt/lib/ubsan/ubsan_value.h
index 9426c6943db0..e92b2d6fcc16 100644
--- a/compiler-rt/lib/ubsan/ubsan_value.h
+++ b/compiler-rt/lib/ubsan/ubsan_value.h
@@ -23,15 +23,19 @@
 #include "sanitizer_common/sanitizer_common.h"
 
 // FIXME: Move this out to a config header.
+#if defined(__clang__) || _LP64
 typedef __int128 s128;
 typedef unsigned __int128 u128;
 #define HAVE_INT128_T 1
+#else
+#define HAVE_INT128_T 0
+#endif
 
 
 namespace __ubsan {
 
 /// \brief Largest integer types we support.
-#ifdef HAVE_INT128_T
+#if HAVE_INT128_T
 typedef s128 SIntMax;
 typedef u128 UIntMax;
 #else