Skip to content

Commit 83a2b42

Browse files
committed
---
yaml --- r: 15853 b: refs/heads/try c: 55c0088 h: refs/heads/master i: 15851: 54de7f9 v: v3
1 parent 997429c commit 83a2b42

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: db8931c87684993014043592301d4eecc964307d
5+
refs/heads/try: 55c008874de41998e3b86da85b1fa8eccc980c39
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/back/link.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ mod write {
8989
// -Os, etc
9090
// FIXME3: Should we expose and use the pass lists used by the opt
9191
// tool?
92+
// See #2396
9293

9394
if opts.optimize != 0u {
9495
let fpm = mk_pass_manager();
@@ -661,6 +662,7 @@ fn link_binary(sess: session,
661662

662663
// FIXME: At some point we want to rpath our guesses as to where
663664
// native libraries might live, based on the addl_lib_search_paths
665+
// #2397
664666
cc_args += rpath::get_rpath_flags(sess, output);
665667

666668
#debug("%s link args: %s", cc_prog, str::connect(cc_args, " "));

branches/try/src/rustc/back/x86_64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fn get_target_strs(target_os: session::os) -> target_strs::t {
1919
}
2020

2121
session::os_win32 {
22-
// FIXME: Test this. Copied from linux
22+
// FIXME: Test this. Copied from linux (#2398)
2323
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-"+
2424
"f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-"+
2525
"s0:64:64-f80:128:128-n8:16:32:64-S128"

branches/try/src/rustc/driver/driver.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ fn build_configuration(sess: session, argv0: str, input: input) ->
7979
fn parse_cfgspecs(cfgspecs: [str]) -> ast::crate_cfg {
8080
// FIXME: It would be nice to use the parser to parse all varieties of
8181
// meta_item here. At the moment we just support the meta_word variant.
82+
// #2399
8283
let mut words = [];
8384
for cfgspecs.each {|s| words += [attr::mk_word_item(s)]; }
8485
ret words;
@@ -99,6 +100,7 @@ fn parse_input(sess: session, cfg: ast::crate_cfg, input: input)
99100
}
100101
str_input(src) {
101102
// FIXME: Don't really want to box the source string
103+
// #2319
102104
parse::parse_crate_from_source_str(
103105
anon_src(), @src, cfg, sess.parse_sess)
104106
}
@@ -369,7 +371,7 @@ fn host_triple() -> str {
369371
// normalize all ix86 architectures to i386.
370372
// FIXME: Instead of grabbing the host triple we really should be
371373
// grabbing (at compile time) the target triple that this rustc is
372-
// built with and calling that (at runtime) the host triple.
374+
// built with and calling that (at runtime) the host triple. (#2400)
373375
let ht = #env("CFG_HOST_TRIPLE");
374376
ret if ht != "" {
375377
ht
@@ -654,7 +656,7 @@ fn build_output_filenames(input: input,
654656
// FIXME: We might want to warn here; we're actually not going to
655657
// respect the user's choice of library name when it comes time to
656658
// link, we'll be linking to lib<basename>-<hash>-<version>.so no
657-
// matter what.
659+
// matter what. (#2401)
658660
}
659661

660662
if odir != none {

0 commit comments

Comments
 (0)