Skip to content

Commit 58e74a9

Browse files
borsbors
committed
---
yaml --- r: 140031 b: refs/heads/try2 c: 2871f4d h: refs/heads/master i: 140029: d6d85d2 140027: 720a00c 140023: d7b2a2b 140015: 60458c2 139999: 58c4fb4 139967: ba8009b 139903: b02b2f3 139775: 2db0e9c v: v3
1 parent 7bfdab1 commit 58e74a9

File tree

16 files changed

+138
-169
lines changed

16 files changed

+138
-169
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 4508da226ab598e646ef7cbac805cdcc8deb07a4
8+
refs/heads/try2: 2871f4df6fe7a19d41ddca71d96b9192d86d278b
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/src/libcore/num/strconv.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,7 @@ mod test {
655655
use option::*;
656656

657657
#[test]
658+
#[ignore(reason = "fails in x86")]
658659
fn from_str_ignore_underscores() {
659660
let s : Option<u8> = from_str_common("__1__", 2, false, false, false,
660661
ExpNone, false, true);

‎branches/try2/src/librustc/back/link.rs

Lines changed: 49 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -61,23 +61,32 @@ pub fn llvm_err(sess: Session, msg: ~str) -> ! {
6161
6262
pub fn WriteOutputFile(sess: Session,
6363
PM: lib::llvm::PassManagerRef, M: ModuleRef,
64-
Triple: *c_char,
64+
Triple: &str,
65+
Feature: &str,
66+
Output: &str,
6567
// FIXME: When #2334 is fixed, change
6668
// c_uint to FileType
67-
Output: *c_char, FileType: c_uint,
69+
FileType: c_uint,
6870
OptLevel: c_int,
6971
EnableSegmentedStacks: bool) {
7072
unsafe {
71-
let result = llvm::LLVMRustWriteOutputFile(
72-
PM,
73-
M,
74-
Triple,
75-
Output,
76-
FileType,
77-
OptLevel,
78-
EnableSegmentedStacks);
79-
if (!result) {
80-
llvm_err(sess, ~"Could not write output");
73+
do str::as_c_str(Triple) |Triple| {
74+
do str::as_c_str(Feature) |Feature| {
75+
do str::as_c_str(Output) |Output| {
76+
let result = llvm::LLVMRustWriteOutputFile(
77+
PM,
78+
M,
79+
Triple,
80+
Feature,
81+
Output,
82+
FileType,
83+
OptLevel,
84+
EnableSegmentedStacks);
85+
if (!result) {
86+
llvm_err(sess, ~"Could not write output");
87+
}
88+
}
89+
}
8190
}
8291
}
8392
}
@@ -310,66 +319,49 @@ pub mod write {
310319
llvm::LLVMWriteBitcodeToFile(llmod, buf)
311320
});
312321
pm = mk_pass_manager();
313-
// Save the assembly file if -S is used
314322

323+
// Save the assembly file if -S is used
315324
if output_type == output_type_assembly {
316-
let _: () = str::as_c_str(
325+
WriteOutputFile(
326+
sess,
327+
pm.llpm,
328+
llmod,
317329
sess.targ_cfg.target_strs.target_triple,
318-
|buf_t| {
319-
str::as_c_str(output.to_str(), |buf_o| {
320-
WriteOutputFile(
321-
sess,
322-
pm.llpm,
323-
llmod,
324-
buf_t,
325-
buf_o,
326-
lib::llvm::AssemblyFile as c_uint,
327-
CodeGenOptLevel,
328-
true)
329-
})
330-
});
330+
opts.target_feature,
331+
output.to_str(),
332+
lib::llvm::AssemblyFile as c_uint,
333+
CodeGenOptLevel,
334+
true);
331335
}
332336

333-
334337
// Save the object file for -c or --save-temps alone
335338
// This .o is needed when an exe is built
336339
if output_type == output_type_object ||
337340
output_type == output_type_exe {
338-
let _: () = str::as_c_str(
341+
WriteOutputFile(
342+
sess,
343+
pm.llpm,
344+
llmod,
339345
sess.targ_cfg.target_strs.target_triple,
340-
|buf_t| {
341-
str::as_c_str(output.to_str(), |buf_o| {
342-
WriteOutputFile(
343-
sess,
344-
pm.llpm,
345-
llmod,
346-
buf_t,
347-
buf_o,
348-
lib::llvm::ObjectFile as c_uint,
349-
CodeGenOptLevel,
350-
true)
351-
})
352-
});
346+
opts.target_feature,
347+
output.to_str(),
348+
lib::llvm::ObjectFile as c_uint,
349+
CodeGenOptLevel,
350+
true);
353351
}
354352
} else {
355353
// If we aren't saving temps then just output the file
356354
// type corresponding to the '-c' or '-S' flag used
357-
358-
let _: () = str::as_c_str(
355+
WriteOutputFile(
356+
sess,
357+
pm.llpm,
358+
llmod,
359359
sess.targ_cfg.target_strs.target_triple,
360-
|buf_t| {
361-
str::as_c_str(output.to_str(), |buf_o| {
362-
WriteOutputFile(
363-
sess,
364-
pm.llpm,
365-
llmod,
366-
buf_t,
367-
buf_o,
368-
FileType as c_uint,
369-
CodeGenOptLevel,
370-
true)
371-
})
372-
});
360+
opts.target_feature,
361+
output.to_str(),
362+
FileType as c_uint,
363+
CodeGenOptLevel,
364+
true);
373365
}
374366
// Clean up and return
375367

‎branches/try2/src/librustc/driver/driver.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,7 @@ pub fn build_session_options(binary: @~str,
599599
let sysroot_opt = getopts::opt_maybe_str(matches, ~"sysroot");
600600
let sysroot_opt = sysroot_opt.map(|m| Path(*m));
601601
let target_opt = getopts::opt_maybe_str(matches, ~"target");
602+
let target_feature_opt = getopts::opt_maybe_str(matches, ~"target-feature");
602603
let save_temps = getopts::opt_present(matches, ~"save-temps");
603604
match output_type {
604605
// unless we're emitting huamn-readable assembly, omit comments.
@@ -637,6 +638,10 @@ pub fn build_session_options(binary: @~str,
637638
None => host_triple(),
638639
Some(s) => s
639640
};
641+
let target_feature = match target_feature_opt {
642+
None => ~"",
643+
Some(s) => s
644+
};
640645
641646
let addl_lib_search_paths =
642647
getopts::opt_strs(matches, ~"L")
@@ -659,6 +664,7 @@ pub fn build_session_options(binary: @~str,
659664
addl_lib_search_paths: addl_lib_search_paths,
660665
maybe_sysroot: sysroot_opt,
661666
target_triple: target,
667+
target_feature: target_feature,
662668
cfg: cfg,
663669
binary: binary,
664670
test: test,
@@ -769,6 +775,9 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] {
769775
~"Target triple cpu-manufacturer-kernel[-os]
770776
to compile for (see chapter 3.4 of http://www.sourceware.org/autobook/
771777
for detail)", ~"TRIPLE"),
778+
optopt(~"", ~"target-feature",
779+
~"Target specific attributes (llc -mattr=help
780+
for detail)", ~"FEATURE"),
772781
optopt(~"", ~"android-cross-path",
773782
~"The path to the Android NDK", "PATH"),
774783
optmulti(~"W", ~"warn",

‎branches/try2/src/librustc/driver/session.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ pub struct options {
126126
addl_lib_search_paths: ~[Path],
127127
maybe_sysroot: Option<Path>,
128128
target_triple: ~str,
129+
target_feature: ~str,
129130
// User-specified cfg meta items. The compiler itself will add additional
130131
// items to the crate config, and during parsing the entire crate config
131132
// will be added to the crate AST node. This should not be used for
@@ -302,6 +303,7 @@ pub fn basic_options() -> @options {
302303
addl_lib_search_paths: ~[],
303304
maybe_sysroot: None,
304305
target_triple: host_triple(),
306+
target_feature: ~"",
305307
cfg: ~[],
306308
binary: @~"rustc",
307309
test: false,

‎branches/try2/src/librustc/front/test.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ fn mk_std(cx: &TestCtxt) -> @ast::view_item {
274274
ast::view_item_use(
275275
~[@nospan(ast::view_path_simple(id_std,
276276
path_node(~[id_std]),
277-
ast::type_value_ns,
278277
cx.sess.next_node_id()))])
279278
} else {
280279
ast::view_item_extern_mod(id_std, ~[@mi],

‎branches/try2/src/librustc/lib/llvm.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1799,9 +1799,10 @@ pub mod llvm {
17991799
pub unsafe fn LLVMRustWriteOutputFile(PM: PassManagerRef,
18001800
M: ModuleRef,
18011801
Triple: *c_char,
1802+
Feature: *c_char,
1803+
Output: *c_char,
18021804
// FIXME: When #2334 is fixed,
18031805
// change c_uint to FileType
1804-
Output: *c_char,
18051806
FileType: c_uint,
18061807
OptLevel: c_int,
18071808
EnableSegmentedStacks: bool)

‎branches/try2/src/librustc/middle/resolve.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,7 +1413,7 @@ pub impl Resolver {
14131413
14141414
let mut module_path = ~[];
14151415
match view_path.node {
1416-
view_path_simple(_, full_path, _, _) => {
1416+
view_path_simple(_, full_path, _) => {
14171417
let path_len = full_path.idents.len();
14181418
assert!(path_len != 0);
14191419
@@ -1435,7 +1435,7 @@ pub impl Resolver {
14351435
// Build up the import directives.
14361436
let module_ = self.get_module_from_parent(parent);
14371437
match view_path.node {
1438-
view_path_simple(binding, full_path, _, _) => {
1438+
view_path_simple(binding, full_path, _) => {
14391439
let source_ident = *full_path.idents.last();
14401440
let subclass = @SingleImport(binding,
14411441
source_ident);

0 commit comments

Comments
 (0)