Revert "Use R0/R1 instead of R4/R5 for ARM eh_return return values"

lib/Target/ARM/ARMBaseRegisterInfo.cpp

Index: lib/Target/ARM/ARMBaseRegisterInfo.cpp
diff --git a/lib/Target/ARM/ARMBaseRegisterInfo.cpp b/lib/Target/ARM/ARMBaseRegisterInfo.cpp
index 3efe8bcb05ddaaac4f727ff77d47ffb2891a4d03..b673e9909ee43bcec457a5d0fa823d4645d57e8f 100644
--- a/lib/Target/ARM/ARMBaseRegisterInfo.cpp
+++ b/lib/Target/ARM/ARMBaseRegisterInfo.cpp
@@ -24,7 +24,6 @@
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstrBuilder.h"
-#include "llvm/CodeGen/MachineModuleInfo.h" // @LOCALMOD
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/RegisterScavenging.h"
 #include "llvm/CodeGen/VirtRegMap.h"
@@ -64,14 +63,7 @@ static unsigned getFramePointerReg(const ARMSubtarget &STI) {
 const MCPhysReg*
 ARMBaseRegisterInfo::getCalleeSavedRegs(const MachineFunction *MF) const {
   const ARMSubtarget &STI = MF->getSubtarget<ARMSubtarget>();
-  // @LOCALMOD-START
-  // We don't support special calling conventions for NaCl here.
-  if (STI.isTargetNaCl()) {
-    if (MF->getMMI().callsEHReturn())
-      return CSR_NaCl_EHRet_SaveList;
-    return CSR_NaCl_SaveList;
-  }
-  // @LOCALMOD-END
+  if (STI.isTargetNaCl()) return CSR_NaCl_SaveList; // @LOCALMOD
 
   const MCPhysReg *RegList =
       STI.isTargetDarwin() ? CSR_iOS_SaveList : CSR_AAPCS_SaveList;