diff options
| -rw-r--r-- | src/librustc/back/link.rs | 29 | ||||
| -rw-r--r-- | src/librustc/driver/driver.rs | 9 | ||||
| -rw-r--r-- | src/librustc/driver/session.rs | 2 | ||||
| -rw-r--r-- | src/librustc/lib/llvm.rs | 3 | ||||
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 3 |
5 files changed, 33 insertions, 13 deletions
diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 3d2b46eb51a..6bf09f30898 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -62,6 +62,7 @@ pub fn llvm_err(sess: Session, msg: ~str) -> ! { pub fn WriteOutputFile(sess: Session, PM: lib::llvm::PassManagerRef, M: ModuleRef, Triple: &str, + Feature: &str, Output: &str, // FIXME: When #2334 is fixed, change // c_uint to FileType @@ -70,17 +71,20 @@ pub fn WriteOutputFile(sess: Session, EnableSegmentedStacks: bool) { unsafe { do str::as_c_str(Triple) |Triple| { - do str::as_c_str(Output) |Output| { - let result = llvm::LLVMRustWriteOutputFile( - PM, - M, - Triple, - Output, - FileType, - OptLevel, - EnableSegmentedStacks); - if (!result) { - llvm_err(sess, ~"Could not write output"); + do str::as_c_str(Feature) |Feature| { + do str::as_c_str(Output) |Output| { + let result = llvm::LLVMRustWriteOutputFile( + PM, + M, + Triple, + Feature, + Output, + FileType, + OptLevel, + EnableSegmentedStacks); + if (!result) { + llvm_err(sess, ~"Could not write output"); + } } } } @@ -323,6 +327,7 @@ pub mod write { pm.llpm, llmod, sess.targ_cfg.target_strs.target_triple, + opts.target_feature, output.to_str(), lib::llvm::AssemblyFile as c_uint, CodeGenOptLevel, @@ -338,6 +343,7 @@ pub mod write { pm.llpm, llmod, sess.targ_cfg.target_strs.target_triple, + opts.target_feature, output.to_str(), lib::llvm::ObjectFile as c_uint, CodeGenOptLevel, @@ -351,6 +357,7 @@ pub mod write { pm.llpm, llmod, sess.targ_cfg.target_strs.target_triple, + opts.target_feature, output.to_str(), FileType as c_uint, CodeGenOptLevel, diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs index fae73d7faf2..857a06f13f9 100644 --- a/src/librustc/driver/driver.rs +++ b/src/librustc/driver/driver.rs @@ -599,6 +599,7 @@ pub fn build_session_options(binary: @~str, let sysroot_opt = getopts::opt_maybe_str(matches, ~"sysroot"); let sysroot_opt = sysroot_opt.map(|m| Path(*m)); let target_opt = getopts::opt_maybe_str(matches, ~"target"); + let target_feature_opt = getopts::opt_maybe_str(matches, ~"target-feature"); let save_temps = getopts::opt_present(matches, ~"save-temps"); match output_type { // unless we're emitting huamn-readable assembly, omit comments. @@ -637,6 +638,10 @@ pub fn build_session_options(binary: @~str, None => host_triple(), Some(s) => s }; + let target_feature = match target_feature_opt { + None => ~"", + Some(s) => s + }; let addl_lib_search_paths = getopts::opt_strs(matches, ~"L") @@ -659,6 +664,7 @@ pub fn build_session_options(binary: @~str, addl_lib_search_paths: addl_lib_search_paths, maybe_sysroot: sysroot_opt, target_triple: target, + target_feature: target_feature, cfg: cfg, binary: binary, test: test, @@ -769,6 +775,9 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] { ~"Target triple cpu-manufacturer-kernel[-os] to compile for (see chapter 3.4 of http://www.sourceware.org/autobook/ for detail)", ~"TRIPLE"), + optopt(~"", ~"target-feature", + ~"Target specific attributes (llc -mattr=help + for detail)", ~"FEATURE"), optopt(~"", ~"android-cross-path", ~"The path to the Android NDK", "PATH"), optmulti(~"W", ~"warn", diff --git a/src/librustc/driver/session.rs b/src/librustc/driver/session.rs index 1912c922524..a2bbbca0c5a 100644 --- a/src/librustc/driver/session.rs +++ b/src/librustc/driver/session.rs @@ -126,6 +126,7 @@ pub struct options { addl_lib_search_paths: ~[Path], maybe_sysroot: Option<Path>, target_triple: ~str, + target_feature: ~str, // User-specified cfg meta items. The compiler itself will add additional // items to the crate config, and during parsing the entire crate config // will be added to the crate AST node. This should not be used for @@ -302,6 +303,7 @@ pub fn basic_options() -> @options { addl_lib_search_paths: ~[], maybe_sysroot: None, target_triple: host_triple(), + target_feature: ~"", cfg: ~[], binary: @~"rustc", test: false, diff --git a/src/librustc/lib/llvm.rs b/src/librustc/lib/llvm.rs index 369e6aeb4a5..1ab84c7978c 100644 --- a/src/librustc/lib/llvm.rs +++ b/src/librustc/lib/llvm.rs @@ -1799,9 +1799,10 @@ pub mod llvm { pub unsafe fn LLVMRustWriteOutputFile(PM: PassManagerRef, M: ModuleRef, Triple: *c_char, + Feature: *c_char, + Output: *c_char, // FIXME: When #2334 is fixed, // change c_uint to FileType - Output: *c_char, FileType: c_uint, OptLevel: c_int, EnableSegmentedStacks: bool) 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 = |