diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,6 +306,10 @@
 set(CLANG_VENDOR ${PACKAGE_VENDOR} CACHE STRING
   "Vendor-specific text for showing with version information.")
 
+if( CLANG_SystemZTargetCPU )
+  add_definitions( -DCLANG_SystemZTargetCPU="${CLANG_SystemZTargetCPU}" )
+endif()
+
 if( CLANG_VENDOR )
   add_definitions( -DCLANG_VENDOR="${CLANG_VENDOR} " )
 endif()
diff --git a/lib/Driver/ToolChains/Arch/SystemZ.cpp b/lib/Driver/ToolChains/Arch/SystemZ.cpp
--- a/lib/Driver/ToolChains/Arch/SystemZ.cpp
+++ b/lib/Driver/ToolChains/Arch/SystemZ.cpp
@@ -18,7 +18,11 @@
 const char *systemz::getSystemZTargetCPU(const ArgList &Args) {
   if (const Arg *A = Args.getLastArg(clang::driver::options::OPT_march_EQ))
     return A->getValue();
+#if defined(CLANG_SystemZTargetCPU)
+  return CLANG_SystemZTargetCPU;
+#else
   return "z10";
+#endif
 }
 
 void systemz::getSystemZTargetFeatures(const ArgList &Args,