diff options
| author | Chad Rosier <mcrosier@codeaurora.org> | 2016-07-07 20:02:25 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@codeaurora.org> | 2016-07-07 20:02:25 +0000 |
| commit | 4c077aaabb52d074c4e5272835d7fec4b85a4f96 (patch) | |
| tree | efc133b7b3120de0cea0930943c66d9cb3c52f74 /clang | |
| parent | 112d0e996bb833b8c7355947043bfc79075455f9 (diff) | |
| download | bcm5719-llvm-4c077aaabb52d074c4e5272835d7fec4b85a4f96.tar.gz bcm5719-llvm-4c077aaabb52d074c4e5272835d7fec4b85a4f96.zip | |
[AArch64] Change the preferred alignment for char and short.
This reinstates commits r273280 and r273289.
Original Review: http://reviews.llvm.org/D21414.
llvm-svn: 274791
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 4 | ||||
| -rw-r--r-- | clang/test/CodeGen/aarch64-type-sizes.c | 6 | ||||
| -rw-r--r-- | clang/test/CodeGen/target-data.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index a8158a2a301..80b44fc6353 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-i64:64-i128:128-n32:64-S128"); + resetDataLayout("e-m:e-i8:8:32-i16:16:32-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-i64:64-i128:128-n32:64-S128"); + resetDataLayout("E-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"); } public: diff --git a/clang/test/CodeGen/aarch64-type-sizes.c b/clang/test/CodeGen/aarch64-type-sizes.c index 3ff8c4f0d4d..ce8b51fc408 100644 --- a/clang/test/CodeGen/aarch64-type-sizes.c +++ b/clang/test/CodeGen/aarch64-type-sizes.c @@ -1,8 +1,7 @@ -// RUN: %clang_cc1 -triple aarch64_be-none-linux-gnu -emit-llvm -w -o - %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-BE %s +// RUN: %clang_cc1 -triple aarch64_be-none-linux-gnu -emit-llvm -w -o - %s | FileCheck --check-prefix=CHECK %s // char by definition has size 1 -// CHECK-LE: target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128" -// CHECK-BE: target datalayout = "E-m:e-i64:64-i128:128-n32:64-S128" +// CHECK: target datalayout = "E-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128" int check_short() { return sizeof(short); @@ -89,4 +88,3 @@ int foo() { return sizeof(enum Small); // CHECK: ret i32 4 } - diff --git a/clang/test/CodeGen/target-data.c b/clang/test/CodeGen/target-data.c index b6b64b48db0..49406a30e5d 100644 --- a/clang/test/CodeGen/target-data.c +++ b/clang/test/CodeGen/target-data.c @@ -141,7 +141,7 @@ // RUN: %clang_cc1 -triple arm64-unknown -o - -emit-llvm %s | \ // RUN: FileCheck %s -check-prefix=AARCH64 -// AARCH64: target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128" +// AARCH64: target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128" // RUN: %clang_cc1 -triple thumb-unknown-gnueabi -o - -emit-llvm %s | \ // RUN: FileCheck %s -check-prefix=THUMB |
