diff options
| author | Peter Collingbourne <pcc@google.com> | 2018-10-24 19:09:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-24 19:09:57 -0700 |
| commit | 3541f5a54efc891fdd31aaa1ff64e265cb9e2585 (patch) | |
| tree | 4d012bd4a0a579893fb5ad27b5f50950a72745e7 | |
| parent | 637d4e0afbe4947d9ea6178a0610e7bd9c173f9a (diff) | |
| parent | 15c824a29c387edbc396b241d0487302cfd42979 (diff) | |
| download | llvm-3541f5a54efc891fdd31aaa1ff64e265cb9e2585.tar.gz | |
Merge "Start reserving x18 by default on Android targets." am: 78ed91461c am: 52209c689f
am: 15c824a29c
Change-Id: I97af504491801cc1d803848d1d7c924df56b6e4b
| -rw-r--r-- | lib/Target/AArch64/AArch64Subtarget.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Target/AArch64/AArch64Subtarget.cpp b/lib/Target/AArch64/AArch64Subtarget.cpp index 7dd8ccbe6c25..d1ec642f1518 100644 --- a/lib/Target/AArch64/AArch64Subtarget.cpp +++ b/lib/Target/AArch64/AArch64Subtarget.cpp @@ -88,8 +88,9 @@ void AArch64Subtarget::initializeProperties() { AArch64Subtarget::AArch64Subtarget(const Triple &TT, const std::string &CPU, const std::string &FS, const TargetMachine &TM, bool LittleEndian) - : AArch64GenSubtargetInfo(TT, CPU, FS), ReserveX18(TT.isOSDarwin()), - IsLittle(LittleEndian), CPUString(CPU), TargetTriple(TT), FrameLowering(), + : AArch64GenSubtargetInfo(TT, CPU, FS), + ReserveX18(TT.isOSDarwin() || TT.isAndroid()), IsLittle(LittleEndian), + CPUString(CPU), TargetTriple(TT), FrameLowering(), InstrInfo(initializeSubtargetDependencies(FS)), TSInfo(), TLInfo(TM, *this), GISel() {} |