diff --git a/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp b/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp
index 5d3d932a99c9..521422e7b4a6 100644
--- a/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp
+++ b/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp
@@ -50,19 +50,16 @@ SchedCustomRegistry("r600", "Run R600's custom scheduler",
                     createR600MachineScheduler);
 
 static std::string computeDataLayout(const AMDGPUSubtarget &ST) {
-  std::string DataLayout = std::string(
-   "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128"
-   "-v192:256-v256:256-v512:512-v1024:1024-v2048:2048"
-   "-n32:64"
-  );
+  std::string Ret = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256"
+                    "-v256:256-v512:512-v1024:1024-v2048:2048-n32:64";
 
   if (!ST.is64bit())
-    DataLayout.append("-p:32:32");
+    Ret += "-p:32:32";
 
   if (ST.getGeneration() >= AMDGPUSubtarget::SOUTHERN_ISLANDS)
-    DataLayout.append("-p3:32:32:32");
+    Ret += "-p3:32:32";
 
-  return DataLayout;
+  return Ret;
 }
 
 AMDGPUTargetMachine::AMDGPUTargetMachine(const Target &T, StringRef TT,