diff --git a/lib/Basic/LangOptions.cpp b/lib/Basic/LangOptions.cpp
index 702d50772902a..a53a29474e1e7 100644
--- a/lib/Basic/LangOptions.cpp
+++ b/lib/Basic/LangOptions.cpp
@@ -429,6 +429,7 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
   case llvm::Triple::ArchType::ppc64le:
   case llvm::Triple::ArchType::x86_64:
   case llvm::Triple::ArchType::systemz:
+  case llvm::Triple::ArchType::riscv64:
     addPlatformConditionValue(PlatformConditionKind::PointerBitWidth, "_64");
     break;
   }