commit | 6cc9287e9f2eb5e07940b897f271ea7176b1864c | [log] [tgz] |
---|---|---|
author | Pirama Arumuga Nainar <pirama@google.com> | Wed Oct 26 17:45:16 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 26 17:45:16 2016 +0000 |
tree | 62de9131fc8176db53b6b05d8db4d8b51862f816 | |
parent | e5ad0fd51727b9608ac2cf9290c0a18e4a5fc6ce [diff] | |
parent | fa083b9e91969ed6f15fac2fffb619c9e82746b1 [diff] |
Merge "Fix mclinker for LLVM rebase to r275480" am: fa083b9e91 Change-Id: I965125176cf839da3d2371a776d65dd7689d27c8
diff --git a/lib/Target/AArch64/AArch64LDBackend.cpp b/lib/Target/AArch64/AArch64LDBackend.cpp index b899a5c..08a5701 100644 --- a/lib/Target/AArch64/AArch64LDBackend.cpp +++ b/lib/Target/AArch64/AArch64LDBackend.cpp
@@ -443,7 +443,7 @@ } Fragment* exit = &*(*island).end(); - if (exit == (*island).begin()->getParent()->end()) { + if (exit == &*(*island).begin()->getParent()->end()) { continue; }
diff --git a/lib/Target/ARM/ARMLDBackend.cpp b/lib/Target/ARM/ARMLDBackend.cpp index b2fbfb2..4cf7a50 100644 --- a/lib/Target/ARM/ARMLDBackend.cpp +++ b/lib/Target/ARM/ARMLDBackend.cpp
@@ -913,7 +913,7 @@ } Fragment* exit = &*(*island).end(); - if (exit == (*island).begin()->getParent()->end()) { + if (exit == &*(*island).begin()->getParent()->end()) { continue; }
diff --git a/lib/Target/Mips/MipsLDBackend.cpp b/lib/Target/Mips/MipsLDBackend.cpp index d4e8145..732595d 100644 --- a/lib/Target/Mips/MipsLDBackend.cpp +++ b/lib/Target/Mips/MipsLDBackend.cpp
@@ -842,7 +842,7 @@ } Fragment* exit = &*island.end(); - if (exit == island.begin()->getParent()->end()) { + if (exit == &*island.begin()->getParent()->end()) { continue; }