diff options
| author | Eli Bendersky <eliben@chromium.org> | 2013-03-11 15:38:11 -0700 |
|---|---|---|
| committer | Eli Bendersky <eliben@chromium.org> | 2013-03-20 14:49:21 -0700 |
| commit | d41567d2ffd3413600162653c08b2365bd5bcbbf (patch) | |
| tree | aa1c212bcf816f4011315b80826acfb85ae7d9f3 /lib/Target/X86/X86TargetMachine.cpp | |
| parent | 23c00401dad33ca247d2818e71540079bed63c5b (diff) | |
Apply after-merge fixes to return to working state.
Diffstat (limited to 'lib/Target/X86/X86TargetMachine.cpp')
| -rw-r--r-- | lib/Target/X86/X86TargetMachine.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp index a9a6579c47..dca129a3ea 100644 --- a/lib/Target/X86/X86TargetMachine.cpp +++ b/lib/Target/X86/X86TargetMachine.cpp @@ -45,8 +45,7 @@ X86_32TargetMachine::X86_32TargetMachine(const Target &T, StringRef TT, "n8:16:32-S32" : getSubtargetImpl()->isTargetNaCl() ? // @LOCALMOD "e-p:32:32-s:32-f64:64:64-f32:32:32-f80:128:128-i64:64:64-n8:16:32-S128" : - "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-f128:128:128-" - "n8:16:32-S128"), + "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-f128:128:128-n8:16:32-S128"), InstrInfo(*this), TLInfo(*this), TSInfo(*this), @@ -63,9 +62,11 @@ X86_64TargetMachine::X86_64TargetMachine(const Target &T, StringRef TT, : X86TargetMachine(T, TT, CPU, FS, Options, RM, CM, OL, true), DL(getSubtargetImpl()->isTargetNaCl() ? // @LOCALMOD "e-p:32:32-s:64-f64:64:64-f32:32:32-f80:128:128-i64:64:64-" - "n8:16:32:64-S128" : - "e-p:64:64-s:64-f64:64:64-i64:64:64-f80:128:128-f128:128:128-" - "n8:16:32:64-S128"), + "n8:16:32:64-S128" : (getSubtargetImpl()->isTarget64BitILP32() ? + "e-p:32:32-s:64-f64:64:64-i64:64:64-f80:128:128-f128:128:128-" + "n8:16:32:64-S128" : + "e-p:64:64-s:64-f64:64:64-i64:64:64-f80:128:128-f128:128:128-" + "n8:16:32:64-S128")), InstrInfo(*this), TLInfo(*this), TSInfo(*this), @@ -156,6 +157,7 @@ public: } virtual bool addInstSelector(); + virtual bool addILPOpts(); virtual bool addPreRegAlloc(); virtual bool addPostRegAlloc(); virtual bool addPreEmitPass(); |