Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(291)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: lib/Target/ARM/ARMFrameLowering.cpp

Issue 939073008: Rebased PNaCl localmods in LLVM to 223109 (Closed)
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« include/llvm/ADT/Triple.h ('K') | « lib/Target/ARM/ARMFastISel.cpp ('k') | lib/Target/ARM/ARMISelDAGToDAG.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/Target/ARM/ARMFrameLowering.cpp
diff --git a/lib/Target/ARM/ARMFrameLowering.cpp b/lib/Target/ARM/ARMFrameLowering.cpp
index 4f3012e9aafc8baebc933efb9ab09274a733dd5b..2ed0e26dce4041ba0467e43e1155346dc15a8dde 100644
--- a/lib/Target/ARM/ARMFrameLowering.cpp
+++ b/lib/Target/ARM/ARMFrameLowering.cpp
@@ -970,7 +970,8 @@ void ARMFrameLowering::emitPopInst(MachineBasicBlock &MBB,
continue;
if (Reg == ARM::LR && !isTailCall && !isVarArg && !isInterrupt &&
- STI.hasV5TOps()) {
+ STI.hasV5TOps() &&
+ !STI.isTargetNaCl() /* @LOCALMOD */) {
Reg = ARM::PC;
LdmOpc = AFI->isThumbFunction() ? ARM::t2LDMIA_RET : ARM::LDMIA_RET;
// Fold the return instruction into the LDM.
« include/llvm/ADT/Triple.h ('K') | « lib/Target/ARM/ARMFastISel.cpp ('k') | lib/Target/ARM/ARMISelDAGToDAG.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698