diff options
| author | Pirama Arumuga Nainar <pirama@google.com> | 2016-10-26 18:09:08 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-26 18:09:08 +0000 |
| commit | 61594e9f65611d96a1b8284ba02283e8cd92d60d (patch) | |
| tree | 62de9131fc8176db53b6b05d8db4d8b51862f816 | |
| parent | e5ad0fd51727b9608ac2cf9290c0a18e4a5fc6ce (diff) | |
| parent | 880a26b8eaece62d04605f5a3baf7b3f55b46b16 (diff) | |
| download | mclinker-61594e9f65611d96a1b8284ba02283e8cd92d60d.tar.gz | |
Merge "Fix mclinker for LLVM rebase to r275480" am: fa083b9e91 am: 6cc9287e9f
am: 880a26b8ea
Change-Id: Ib10a65711cc1edaeb0ae3f2d4a2ee5da3f91ede4
| -rw-r--r-- | lib/Target/AArch64/AArch64LDBackend.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/ARM/ARMLDBackend.cpp | 2 | ||||
| -rw-r--r-- | lib/Target/Mips/MipsLDBackend.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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 @@ bool AArch64GNULDBackend::doRelax(Module& pModule, } 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 @@ bool ARMGNULDBackend::doRelax(Module& pModule, } 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 @@ bool MipsGNULDBackend::doRelax(Module& pModule, } Fragment* exit = &*island.end(); - if (exit == island.begin()->getParent()->end()) { + if (exit == &*island.begin()->getParent()->end()) { continue; } |