aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sehr <sehr@chromium.org>2012-11-14 10:32:18 -0800
committerDavid Sehr <sehr@chromium.org>2012-11-14 10:32:18 -0800
commitdd5234b1fcfe23c41acb0a1adb68514b7e622c81 (patch)
tree1c9a4b8c09f4fa790515f582f3e71aafcfdc54fc
parentcf7e8fe0490f2b26e8d3eafb5330636927b9ed56 (diff)
Use __aeabi_read_tp for non-nacl
Fixes an introduced if statement to use the upstream version when other than nacl targets are used. BUG= http://code.google.com/p/nativeclient/issues/detail?id=1711 Review URL: https://codereview.chromium.org/11410094
-rw-r--r--lib/Target/ARM/ARMExpandPseudoInsts.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/ARM/ARMExpandPseudoInsts.cpp b/lib/Target/ARM/ARMExpandPseudoInsts.cpp
index 4956c59606..348f234f5c 100644
--- a/lib/Target/ARM/ARMExpandPseudoInsts.cpp
+++ b/lib/Target/ARM/ARMExpandPseudoInsts.cpp
@@ -932,7 +932,7 @@ bool ARMExpandPseudo::ExpandMI(MachineBasicBlock &MBB,
case ARM::tTPsoft:
case ARM::TPsoft: {
// @LOCALMOD-BEGIN
- if (llvm::TLSUseCall) {
+ if (!STI->isTargetNaCl() || llvm::TLSUseCall) {
// Don't add implicit uses/defs for this call, otherwise
// liveness analysis passes get confused.
MachineInstrBuilder MIB =