diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2018-08-29 01:38:47 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2018-08-29 01:38:47 +0000 |
| commit | 9c9c8b22d2ea150cc889232871b0c8303d3644d9 (patch) | |
| tree | 3594cc5dbd15acd553080a6be164799a8d8c504e | |
| parent | d9198907a693d8c2210c163c1638d23d50f7ccd5 (diff) | |
| download | bcm5719-llvm-9c9c8b22d2ea150cc889232871b0c8303d3644d9.tar.gz bcm5719-llvm-9c9c8b22d2ea150cc889232871b0c8303d3644d9.zip | |
Start reserving x18 by default on Android targets.
Differential Revision: https://reviews.llvm.org/D45588
llvm-svn: 340889
| -rw-r--r-- | clang/test/Driver/sanitizer-ld.c | 3 | ||||
| -rw-r--r-- | llvm/lib/Support/TargetParser.cpp | 3 | ||||
| -rw-r--r-- | llvm/test/CodeGen/AArch64/arm64-platform-reg.ll | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/clang/test/Driver/sanitizer-ld.c b/clang/test/Driver/sanitizer-ld.c index 483c87a6242..ca16932f073 100644 --- a/clang/test/Driver/sanitizer-ld.c +++ b/clang/test/Driver/sanitizer-ld.c @@ -575,6 +575,9 @@ // RUN: %clang -fsanitize=shadow-call-stack %s -### -o %t.o 2>&1 \ // RUN: -target arm64-unknown-ios -fuse-ld=ld \ // RUN: | FileCheck --check-prefix=CHECK-SHADOWCALLSTACK-LINUX-AARCH64-X18 %s +// RUN: %clang -fsanitize=shadow-call-stack %s -### -o %t.o 2>&1 \ +// RUN: -target aarch64-unknown-linux-android -fuse-ld=ld \ +// RUN: | FileCheck --check-prefix=CHECK-SHADOWCALLSTACK-LINUX-AARCH64-X18 %s // CHECK-SHADOWCALLSTACK-LINUX-AARCH64-X18-NOT: error: // RUN: %clang -fsanitize=shadow-call-stack %s -### -o %t.o 2>&1 \ diff --git a/llvm/lib/Support/TargetParser.cpp b/llvm/lib/Support/TargetParser.cpp index 20aae02f5e5..1f580378c01 100644 --- a/llvm/lib/Support/TargetParser.cpp +++ b/llvm/lib/Support/TargetParser.cpp @@ -943,7 +943,8 @@ unsigned llvm::AArch64::parseArchVersion(StringRef Arch) { } bool llvm::AArch64::isX18ReservedByDefault(const Triple &TT) { - return TT.isOSDarwin() || TT.isOSFuchsia() || TT.isOSWindows(); + return TT.isAndroid() || TT.isOSDarwin() || TT.isOSFuchsia() || + TT.isOSWindows(); } struct GPUInfo { diff --git a/llvm/test/CodeGen/AArch64/arm64-platform-reg.ll b/llvm/test/CodeGen/AArch64/arm64-platform-reg.ll index 145066e697f..899759624c2 100644 --- a/llvm/test/CodeGen/AArch64/arm64-platform-reg.ll +++ b/llvm/test/CodeGen/AArch64/arm64-platform-reg.ll @@ -3,6 +3,7 @@ ; RUN: llc -mtriple=aarch64-fuchsia -mattr=+reserve-x20 -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE --check-prefix=CHECK-RESERVE-X20 ; RUN: llc -mtriple=aarch64-fuchsia -mattr=+reserve-x18,+reserve-x20 -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE --check-prefix=CHECK-RESERVE-X18 --check-prefix=CHECK-RESERVE-X20 ; RUN: llc -mtriple=arm64-linux-gnu -o - %s | FileCheck %s +; RUN: llc -mtriple=aarch64-linux-android -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE --check-prefix=CHECK-RESERVE-X18 ; RUN: llc -mtriple=aarch64-fuchsia -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE --check-prefix=CHECK-RESERVE-X18 ; RUN: llc -mtriple=aarch64-windows -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE --check-prefix=CHECK-RESERVE-X18 |
