diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -2255,11 +2255,11 @@
 
   // Handle -mtune.
 
-  // Default to "generic" unless -march is present or targetting the PS4.
+  // Default to "sandybridge" unless -march is present or targetting the PS4.
   std::string TuneCPU;
   if (!Args.hasArg(clang::driver::options::OPT_march_EQ) &&
       !getToolChain().getTriple().isPS4CPU())
-    TuneCPU = "generic";
+    TuneCPU = "sandybridge";
 
   // Override based on -mtune.
   if (const Arg *A = Args.getLastArg(clang::driver::options::OPT_mtune_EQ)) {
diff --git a/clang/test/Driver/x86-mtune.c b/clang/test/Driver/x86-mtune.c
--- a/clang/test/Driver/x86-mtune.c
+++ b/clang/test/Driver/x86-mtune.c
@@ -3,7 +3,7 @@
 // Default mtune should be generic.
 // RUN: %clang -target x86_64-unknown-unknown -c -### %s 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=notune
-// notune: "-tune-cpu" "generic"
+// notune: "-tune-cpu" "sandybridge"
 
 // RUN: %clang -target x86_64-unknown-unknown -c -### %s -mtune=generic 2>&1 \
 // RUN:   | FileCheck %s -check-prefix=generic