projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Silencing an MSVC C4334 warning ('<<' : result of 32-bit shift implicitly converted...
[oota-llvm.git]
/
lib
/
Target
/
ARM
/
Thumb1InstrInfo.cpp
diff --git
a/lib/Target/ARM/Thumb1InstrInfo.cpp
b/lib/Target/ARM/Thumb1InstrInfo.cpp
index c66cc7b1a93cc6f0e51771a828dd43801ed679af..abde25081b00e6f94b722eb63e500ee87db3f418 100644
(file)
--- a/
lib/Target/ARM/Thumb1InstrInfo.cpp
+++ b/
lib/Target/ARM/Thumb1InstrInfo.cpp
@@
-105,8
+105,8
@@
loadRegFromStackSlot(MachineBasicBlock &MBB, MachineBasicBlock::iterator I,
void
Thumb1InstrInfo::expandLoadStackGuard(MachineBasicBlock::iterator MI,
Reloc::Model RM) const {
void
Thumb1InstrInfo::expandLoadStackGuard(MachineBasicBlock::iterator MI,
Reloc::Model RM) const {
- if (RM == Reloc::Static)
- expandLoadStackGuardBase(MI, ARM::tLDRLIT_ga_abs, ARM::tLDRi, RM);
- else
+ if (RM == Reloc::PIC_)
expandLoadStackGuardBase(MI, ARM::tLDRLIT_ga_pcrel, ARM::tLDRi, RM);
expandLoadStackGuardBase(MI, ARM::tLDRLIT_ga_pcrel, ARM::tLDRi, RM);
+ else
+ expandLoadStackGuardBase(MI, ARM::tLDRLIT_ga_abs, ARM::tLDRi, RM);
}
}