diff options
| author | Eli Bendersky <eliben@google.com> | 2013-01-30 16:30:19 +0000 |
|---|---|---|
| committer | Eli Bendersky <eliben@google.com> | 2013-01-30 16:30:19 +0000 |
| commit | 2e2ce49e59c8c43d81f6d4a2b336c11a18584776 (patch) | |
| tree | 6b60632e84099d695ddf018f30b5827062514b53 /llvm/lib/Target/ARM/ARMFastISel.cpp | |
| parent | e07245cdfc4e5b202adc6e7757337d37beda4a4b (diff) | |
| download | bcm5719-llvm-2e2ce49e59c8c43d81f6d4a2b336c11a18584776.tar.gz bcm5719-llvm-2e2ce49e59c8c43d81f6d4a2b336c11a18584776.zip | |
Add a special ARM trap encoding for NaCl.
More details in this thread: http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20130128/163783.html
Patch by JF Bastien
llvm-svn: 173943
Diffstat (limited to 'llvm/lib/Target/ARM/ARMFastISel.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMFastISel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/ARMFastISel.cpp b/llvm/lib/Target/ARM/ARMFastISel.cpp index 94c574aa7e2..a2d0cde526f 100644 --- a/llvm/lib/Target/ARM/ARMFastISel.cpp +++ b/llvm/lib/Target/ARM/ARMFastISel.cpp @@ -2562,7 +2562,8 @@ bool ARMFastISel::SelectIntrinsicCall(const IntrinsicInst &I) { return SelectCall(&I, "memset"); } case Intrinsic::trap: { - BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get(ARM::TRAP)); + BuildMI(*FuncInfo.MBB, FuncInfo.InsertPt, DL, TII.get( + Subtarget->useNaClTrap() ? ARM::TRAPNaCl : ARM::TRAP)); return true; } } |
