r274766 - Revert "[AArch64] Change the preferred alignment for char and short to word alignment"

[Chad Rosier via cfe-commits]

Author: mcrosier
Date: Thu Jul  7 11:37:19 2016
New Revision: 274766

URL: http://llvm.org/viewvc/llvm-project?rev=274766&view=rev
Log:
Revert "[AArch64] Change the preferred alignment for char and short to word alignment"

This reverts commit r273280 as the change was not properly approved.

Modified:
    cfe/trunk/lib/Basic/Targets.cpp

Modified: cfe/trunk/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/Targets.cpp?rev=274766&r1=274765&r2=274766&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/Targets.cpp (original)
+++ cfe/trunk/lib/Basic/Targets.cpp Thu Jul  7 11:37:19 2016
@@ -5994,7 +5994,7 @@ class AArch64leTargetInfo : public AArch
     if (getTriple().isOSBinFormatMachO())
       resetDataLayout("e-m:o-i64:64-i128:128-n32:64-S128");
     else
-      resetDataLayout("e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128");
+      resetDataLayout("e-m:e-i64:64-i128:128-n32:64-S128");
   }
 
 public:
@@ -6012,7 +6012,7 @@ public:
 class AArch64beTargetInfo : public AArch64TargetInfo {
   void setDataLayout() override {
     assert(!getTriple().isOSBinFormatMachO());
-    resetDataLayout("E-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128");
+    resetDataLayout("E-m:e-i64:64-i128:128-n32:64-S128");
   }
 
 public: