diff options
| author | Logan Chien <loganchien@google.com> | 2011-07-20 14:35:08 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2011-07-20 14:37:02 +0800 |
| commit | ebf5f0962932032481ae306b42c96c68c3a0be95 (patch) | |
| tree | bbb4590c963c577450081053136a90c5bd05c74e /lib/Target/MSP430/MSP430TargetMachine.h | |
| parent | 46b77918fb8670fbc0a4a6389c5fa0795264c2cb (diff) | |
| parent | e76a33b9567d78a5744dc52fcec3a6056d6fb576 (diff) | |
| download | external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.zip external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.tar.gz external_llvm-ebf5f0962932032481ae306b42c96c68c3a0be95.tar.bz2 | |
Merge with LLVM upstream r135568 (Jul 20th 2011)
Conflicts:
lib/Bitcode/Reader/BitcodeReader.cpp
Change-Id: Iebed76d2f7d281e742947e31d9a0b78174daf2d6
Diffstat (limited to 'lib/Target/MSP430/MSP430TargetMachine.h')
| -rw-r--r-- | lib/Target/MSP430/MSP430TargetMachine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/MSP430/MSP430TargetMachine.h b/lib/Target/MSP430/MSP430TargetMachine.h index 2a9eea0..384176c 100644 --- a/lib/Target/MSP430/MSP430TargetMachine.h +++ b/lib/Target/MSP430/MSP430TargetMachine.h @@ -38,8 +38,8 @@ class MSP430TargetMachine : public LLVMTargetMachine { MSP430FrameLowering FrameLowering; public: - MSP430TargetMachine(const Target &T, const std::string &TT, - const std::string &CPU, const std::string &FS); + MSP430TargetMachine(const Target &T, StringRef TT, + StringRef CPU, StringRef FS, Reloc::Model RM); virtual const TargetFrameLowering *getFrameLowering() const { return &FrameLowering; |