diff --git a/lib/Target/NVPTX/NVPTXTargetMachine.cpp b/lib/Target/NVPTX/NVPTXTargetMachine.cpp
index 272940d4dc6..6cfd7e15e9a 100644
--- a/lib/Target/NVPTX/NVPTXTargetMachine.cpp
+++ b/lib/Target/NVPTX/NVPTXTargetMachine.cpp
@@ -69,9 +69,7 @@ static std::string computeDataLayout(const NVPTXSubtarget &ST) {
   if (!ST.is64Bit())
     Ret += "-p:32:32:32";
 
-  Ret += "-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-"
-         "f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-"
-         "n16:32:64";
+  Ret += "-i64:64:64-v16:16:16-v32:32:32-n16:32:64";
 
   return Ret;
 }
diff --git a/lib/Target/R600/AMDGPUTargetMachine.cpp b/lib/Target/R600/AMDGPUTargetMachine.cpp
index ae56e7923df..48ea7c84bfe 100644
--- a/lib/Target/R600/AMDGPUTargetMachine.cpp
+++ b/lib/Target/R600/AMDGPUTargetMachine.cpp
@@ -51,16 +51,11 @@ SchedCustomRegistry("r600", "Run R600's custom scheduler",
 
 static std::string computeDataLayout(const AMDGPUSubtarget &ST) {
   std::string DataLayout = std::string(
-   "e"
-   "-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32"
-   "-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v64:64:64-v96:128:128-v128:128:128"
+   "e-i64:64:64-v16:16:16-v24:32:32-v32:32:32-v48:64:64-v96:128:128"
    "-v192:256:256-v256:256:256-v512:512:512-v1024:1024:1024-v2048:2048:2048"
    "-n32:64"
   );
 
-  if (ST.hasHWFP64())
-    DataLayout.append("-f64:64:64");
-
   if (!ST.is64bit())
     DataLayout.append("-p:32:32:32");