diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-11 17:01:28 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-11 17:01:28 -0700 |
| commit | 4db6bb7837c58641c4416e87643833bca4945841 (patch) | |
| tree | 5f06f1dd5968c63c8e94cc077fd6016165ba0931 /lib/Target/Mips/MipsTargetMachine.cpp | |
| parent | 6b4efcb6bb663678c5cdd63a22e1ccc5ec6819f1 (diff) | |
| parent | 2fa8af224ea026f9432e833fd6f42a216423a010 (diff) | |
Merge commit '2fa8af224ea026f9432e833fd6f42a216423a010'
Conflicts:
lib/ExecutionEngine/JIT/JITEmitter.cpp
lib/MC/MCELFStreamer.cpp
lib/Target/ARM/ARMAsmPrinter.h
lib/Target/X86/X86RegisterInfo.td
lib/Target/X86/X86TargetMachine.cpp
tools/llc/llc.cpp
Diffstat (limited to 'lib/Target/Mips/MipsTargetMachine.cpp')
| -rw-r--r-- | lib/Target/Mips/MipsTargetMachine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Target/Mips/MipsTargetMachine.cpp b/lib/Target/Mips/MipsTargetMachine.cpp index 515d26534a..199fe5f0d3 100644 --- a/lib/Target/Mips/MipsTargetMachine.cpp +++ b/lib/Target/Mips/MipsTargetMachine.cpp @@ -43,7 +43,7 @@ MipsTargetMachine(const Target &T, StringRef TT, bool isLittle) : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL), Subtarget(TT, CPU, FS, isLittle, RM), - DataLayout(isLittle ? + DL(isLittle ? (Subtarget.isABI_N64() ? "e-p:64:64:64-i8:8:32-i16:16:32-i64:64:64-f128:128:128-n32" : "e-p:32:32:32-i8:8:32-i16:16:32-i64:64:64-n32") : |