Index: contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp
===================================================================
--- contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp	(revision 328207)
+++ contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp	(working copy)
@@ -1765,7 +1765,11 @@ void CompilerInvocation::setLangDefaults(LangOptio
       break;
     case InputKind::CXX:
     case InputKind::ObjCXX:
-      LangStd = LangStandard::lang_gnucxx14;
+      // The PS4 uses C++11 as the default C++ standard.
+      if (T.isPS4())
+        LangStd = LangStandard::lang_gnucxx11;
+      else
+        LangStd = LangStandard::lang_gnucxx98;
       break;
     case InputKind::RenderScript:
       LangStd = LangStandard::lang_c99;