commit 61594e9f65611d96a1b8284ba02283e8cd92d60d
author Pirama Arumuga Nainar <pirama@google.com> Wed Oct 26 18:09:08 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 26 18:09:08 2016 +0000
tree 62de9131fc8176db53b6b05d8db4d8b51862f816
parent e5ad0fd51727b9608ac2cf9290c0a18e4a5fc6ce
parent 880a26b8eaece62d04605f5a3baf7b3f55b46b16

Merge "Fix mclinker for LLVM rebase to r275480" am: fa083b9e91 am: 6cc9287e9f
am: 880a26b8ea

Change-Id: Ib10a65711cc1edaeb0ae3f2d4a2ee5da3f91ede4

lib/Target/AArch64/AArch64LDBackend.cpp

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;
     }
 

lib/Target/ARM/ARMLDBackend.cpp

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;
     }
 

lib/Target/Mips/MipsLDBackend.cpp

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;
     }