Skip to content

Choose target features #5996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 23, 2013
Merged

Choose target features #5996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba1f3c9
Convert to C string inside WriteOutputFile
sanxiyn Apr 22, 2013
da4bc49
Choose target features
sanxiyn Apr 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 49 additions & 57 deletions src/librustc/back/link.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,32 @@ pub fn llvm_err(sess: Session, msg: ~str) -> ! {

pub fn WriteOutputFile(sess: Session,
PM: lib::llvm::PassManagerRef, M: ModuleRef,
Triple: *c_char,
Triple: &str,
Feature: &str,
Output: &str,
// FIXME: When #2334 is fixed, change
// c_uint to FileType
Output: *c_char, FileType: c_uint,
FileType: c_uint,
OptLevel: c_int,
EnableSegmentedStacks: bool) {
unsafe {
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(Triple) |Triple| {
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");
}
}
}
}
}
}
Expand Down Expand Up @@ -310,66 +319,49 @@ pub mod write {
llvm::LLVMWriteBitcodeToFile(llmod, buf)
});
pm = mk_pass_manager();
// Save the assembly file if -S is used

// Save the assembly file if -S is used
if output_type == output_type_assembly {
let _: () = str::as_c_str(
WriteOutputFile(
sess,
pm.llpm,
llmod,
sess.targ_cfg.target_strs.target_triple,
|buf_t| {
str::as_c_str(output.to_str(), |buf_o| {
WriteOutputFile(
sess,
pm.llpm,
llmod,
buf_t,
buf_o,
lib::llvm::AssemblyFile as c_uint,
CodeGenOptLevel,
true)
})
});
opts.target_feature,
output.to_str(),
lib::llvm::AssemblyFile as c_uint,
CodeGenOptLevel,
true);
}


// Save the object file for -c or --save-temps alone
// This .o is needed when an exe is built
if output_type == output_type_object ||
output_type == output_type_exe {
let _: () = str::as_c_str(
WriteOutputFile(
sess,
pm.llpm,
llmod,
sess.targ_cfg.target_strs.target_triple,
|buf_t| {
str::as_c_str(output.to_str(), |buf_o| {
WriteOutputFile(
sess,
pm.llpm,
llmod,
buf_t,
buf_o,
lib::llvm::ObjectFile as c_uint,
CodeGenOptLevel,
true)
})
});
opts.target_feature,
output.to_str(),
lib::llvm::ObjectFile as c_uint,
CodeGenOptLevel,
true);
}
} else {
// If we aren't saving temps then just output the file
// type corresponding to the '-c' or '-S' flag used

let _: () = str::as_c_str(
WriteOutputFile(
sess,
pm.llpm,
llmod,
sess.targ_cfg.target_strs.target_triple,
|buf_t| {
str::as_c_str(output.to_str(), |buf_o| {
WriteOutputFile(
sess,
pm.llpm,
llmod,
buf_t,
buf_o,
FileType as c_uint,
CodeGenOptLevel,
true)
})
});
opts.target_feature,
output.to_str(),
FileType as c_uint,
CodeGenOptLevel,
true);
}
// Clean up and return

Expand Down
9 changes: 9 additions & 0 deletions src/librustc/driver/driver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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")
Expand All @@ -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,
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions src/librustc/driver/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion src/librustc/lib/llvm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion src/rustllvm/RustWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 =
Expand Down