diff options
| author | bors <bors@rust-lang.org> | 2013-04-22 17:36:49 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-04-22 17:36:49 -0700 |
| commit | 773f7e75603a0bb99682a761d5b77577bb876c3c (patch) | |
| tree | f84bec585a2ebd07a9480d365f44ace9c0d2ebda /src/rustllvm/RustWrapper.cpp | |
| parent | 05f9586d0682e87362a5783edc7e5238094b8ae2 (diff) | |
| parent | da4bc490e6fcd8042f6ce49da0039d38c22d37f4 (diff) | |
| download | rust-773f7e75603a0bb99682a761d5b77577bb876c3c.tar.gz rust-773f7e75603a0bb99682a761d5b77577bb876c3c.zip | |
auto merge of #5996 : sanxiyn/rust/target-feature, r=graydon
Fix #1879.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 141276e86f0..451a390876c 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -434,6 +434,7 @@ extern "C" bool LLVMRustWriteOutputFile(LLVMPassManagerRef PMR, LLVMModuleRef M, const char *triple, + const char *feature, const char *path, TargetMachine::CodeGenFileType FileType, CodeGenOpt::Level OptLevel, @@ -461,7 +462,7 @@ LLVMRustWriteOutputFile(LLVMPassManagerRef PMR, std::string Err; std::string Trip(Triple::normalize(triple)); - std::string FeaturesStr; + std::string FeaturesStr(feature); std::string CPUStr("generic"); const Target *TheTarget = TargetRegistry::lookupTarget(Trip, Err); TargetMachine *Target = |