From 3e68af8f3d12e273ce34c72ea92ed59e68cb4a1c Mon Sep 17 00:00:00 2001 From: Chad Rosier Date: Thu, 7 Jul 2016 16:37:19 +0000 Subject: [PATCH] Revert "[AArch64] Change the preferred alignment for char and short to word alignment" This reverts commit r273280 as the change was not properly approved. llvm-svn: 274766 --- clang/lib/Basic/Targets.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 80b44fc63538..a8158a2a3014 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -5994,7 +5994,7 @@ class AArch64leTargetInfo : public AArch64TargetInfo { 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: