Skip to content

Commit df0c0df

Browse files
lpyalexcrichton
lpy
authored and
alexcrichton
committed
---
yaml --- r: 104182 b: refs/heads/try c: 665555d h: refs/heads/master v: v3
1 parent 773d732 commit df0c0df

File tree

14 files changed

+43
-52
lines changed

14 files changed

+43
-52
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
5-
refs/heads/try: 994747022a45b5c2b03f38dddbe8b43bf09679f3
5+
refs/heads/try: 665555d58f2aa3c1d8aecd7b34392bde6c41b20d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

‎branches/try/mk/platform.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ CFG_GCCISH_DEF_FLAG_arm-apple-darwin := -Wl,-exported_symbols_list,
208208
CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-darwin :=
209209
CFG_GCCISH_POST_LIB_FLAGS_arm-apple-darwin :=
210210
CFG_DEF_SUFFIX_arm-apple-darwin := .darwin.def
211-
CFG_LLC_FLAGS_arm-apple-darwin :=
211+
CFG_LLC_FLAGS_arm-apple-darwin := -arm-enable-ehabi -arm-enable-ehabi-descriptors
212212
CFG_INSTALL_NAME_arm-apple-darwin = -Wl,-install_name,@rpath/$(1)
213213
CFG_LIBUV_LINK_FLAGS_arm-apple-darwin =
214214
CFG_EXE_SUFFIX_arm-apple-darwin :=
@@ -290,7 +290,7 @@ CFG_GCCISH_DEF_FLAG_arm-linux-androideabi := -Wl,--export-dynamic,--dynamic-list
290290
CFG_GCCISH_PRE_LIB_FLAGS_arm-linux-androideabi := -Wl,-whole-archive
291291
CFG_GCCISH_POST_LIB_FLAGS_arm-linux-androideabi := -Wl,-no-whole-archive
292292
CFG_DEF_SUFFIX_arm-linux-androideabi := .android.def
293-
CFG_LLC_FLAGS_arm-linux-androideabi :=
293+
CFG_LLC_FLAGS_arm-linux-androideabi := -arm-enable-ehabi -arm-enable-ehabi-descriptors
294294
CFG_INSTALL_NAME_arm-linux-androideabi =
295295
CFG_LIBUV_LINK_FLAGS_arm-linux-androideabi =
296296
CFG_EXE_SUFFIX_arm-linux-androideabi :=
@@ -320,7 +320,7 @@ CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabihf := -Wl,--export-dynamic,--dynami
320320
CFG_GCCISH_PRE_LIB_FLAGS_arm-unknown-linux-gnueabihf := -Wl,-whole-archive
321321
CFG_GCCISH_POST_LIB_FLAGS_arm-unknown-linux-gnueabihf := -Wl,-no-whole-archive
322322
CFG_DEF_SUFFIX_arm-unknown-linux-gnueabihf := .linux.def
323-
CFG_LLC_FLAGS_arm-unknown-linux-gnueabihf :=
323+
CFG_LLC_FLAGS_arm-unknown-linux-gnueabihf := -arm-enable-ehabi -arm-enable-ehabi-descriptors
324324
CFG_INSTALL_NAME_ar,-unknown-linux-gnueabihf =
325325
CFG_LIBUV_LINK_FLAGS_arm-unknown-linux-gnueabihf =
326326
CFG_EXE_SUFFIX_arm-unknown-linux-gnueabihf :=

‎branches/try/src/libcollections/bitv.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1561,6 +1561,7 @@ mod tests {
15611561
let mut bitv = 0 as uint;
15621562
b.iter(|| {
15631563
bitv |= (1 << ((r.next_u32() as uint) % uint::BITS));
1564+
&bitv
15641565
})
15651566
}
15661567

@@ -1570,6 +1571,7 @@ mod tests {
15701571
let mut bitv = SmallBitv::new(uint::BITS);
15711572
b.iter(|| {
15721573
bitv.set((r.next_u32() as uint) % uint::BITS, true);
1574+
&bitv
15731575
})
15741576
}
15751577

@@ -1579,6 +1581,7 @@ mod tests {
15791581
let mut bitv = BigBitv::new(~[0]);
15801582
b.iter(|| {
15811583
bitv.set((r.next_u32() as uint) % uint::BITS, true);
1584+
&bitv
15821585
})
15831586
}
15841587

@@ -1590,6 +1593,7 @@ mod tests {
15901593
let mut bitv = BigBitv::new(storage);
15911594
b.iter(|| {
15921595
bitv.set((r.next_u32() as uint) % BENCH_BITS, true);
1596+
&bitv
15931597
})
15941598
}
15951599

@@ -1599,6 +1603,7 @@ mod tests {
15991603
let mut bitv = Bitv::new(BENCH_BITS, false);
16001604
b.iter(|| {
16011605
bitv.set((r.next_u32() as uint) % BENCH_BITS, true);
1606+
&bitv
16021607
})
16031608
}
16041609

@@ -1608,6 +1613,7 @@ mod tests {
16081613
let mut bitv = Bitv::new(uint::BITS, false);
16091614
b.iter(|| {
16101615
bitv.set((r.next_u32() as uint) % uint::BITS, true);
1616+
&bitv
16111617
})
16121618
}
16131619

@@ -1617,6 +1623,7 @@ mod tests {
16171623
let mut bitv = BitvSet::new();
16181624
b.iter(|| {
16191625
bitv.insert((r.next_u32() as uint) % uint::BITS);
1626+
&bitv
16201627
})
16211628
}
16221629

@@ -1626,6 +1633,7 @@ mod tests {
16261633
let mut bitv = BitvSet::new();
16271634
b.iter(|| {
16281635
bitv.insert((r.next_u32() as uint) % BENCH_BITS);
1636+
&bitv
16291637
})
16301638
}
16311639

‎branches/try/src/libcollections/deque.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,9 @@ pub mod bench {
115115
// measure
116116
let mut i = 0;
117117
bh.iter(|| {
118-
map.find(&i);
118+
let x = map.find(&i);
119119
i = (i + 1) % n;
120+
x
120121
})
121122
}
122123
}

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,8 @@ pub mod write {
369369
llvm_c_strs.push(s);
370370
};
371371
add("rustc"); // fake program name
372+
add("-arm-enable-ehabi");
373+
add("-arm-enable-ehabi-descriptors");
372374
if vectorize_loop { add("-vectorize-loops"); }
373375
if vectorize_slp { add("-vectorize-slp"); }
374376
if sess.time_llvm_passes() { add("-time-passes"); }
@@ -1082,17 +1084,6 @@ fn link_args(sess: Session,
10821084
args.push(metadata.as_str().unwrap().to_owned());
10831085
}
10841086

1085-
// We want to prevent the compiler from accidentally leaking in any system
1086-
// libraries, so we explicitly ask gcc to not link to any libraries by
1087-
// default. Note that this does not happen for windows because windows pulls
1088-
// in some large number of libraries and I couldn't quite figure out which
1089-
// subset we wanted.
1090-
//
1091-
// FIXME(#11937) we should invoke the system linker directly
1092-
if sess.targ_cfg.os != abi::OsWin32 {
1093-
args.push(~"-nodefaultlibs");
1094-
}
1095-
10961087
if sess.targ_cfg.os == abi::OsLinux {
10971088
// GNU-style linkers will use this to omit linking to libraries which
10981089
// don't actually fulfill any relocations, but only for libraries which

‎branches/try/src/libstd/io/buffered.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,14 +565,14 @@ mod test {
565565
#[bench]
566566
fn bench_buffered_reader(bh: &mut Harness) {
567567
bh.iter(|| {
568-
BufferedReader::new(NullStream);
568+
BufferedReader::new(NullStream)
569569
});
570570
}
571571

572572
#[bench]
573573
fn bench_buffered_writer(bh: &mut Harness) {
574574
bh.iter(|| {
575-
BufferedWriter::new(NullStream);
575+
BufferedWriter::new(NullStream)
576576
});
577577
}
578578

‎branches/try/src/libstd/mem.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,15 +292,15 @@ mod bench {
292292
let s = Struct { field: 10 };
293293
let t = &s as &Trait;
294294
bh.iter(|| {
295-
t.method();
295+
t.method()
296296
});
297297
}
298298

299299
#[bench]
300300
fn trait_static_method_call(bh: &mut BenchHarness) {
301301
let s = Struct { field: 10 };
302302
bh.iter(|| {
303-
s.method();
303+
s.method()
304304
});
305305
}
306306

@@ -310,21 +310,21 @@ mod bench {
310310
fn match_option_some(bh: &mut BenchHarness) {
311311
let x = Some(10);
312312
bh.iter(|| {
313-
let _q = match x {
313+
match x {
314314
Some(y) => y,
315315
None => 11
316-
};
316+
}
317317
});
318318
}
319319

320320
#[bench]
321321
fn match_vec_pattern(bh: &mut BenchHarness) {
322322
let x = [1,2,3,4,5,6];
323323
bh.iter(|| {
324-
let _q = match x {
324+
match x {
325325
[1,2,3,..] => 10,
326326
_ => 11
327-
};
327+
}
328328
});
329329
}
330330
}

‎branches/try/src/libstd/rt/global_heap.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ mod bench {
112112
#[bench]
113113
fn alloc_owned_small(bh: &mut BenchHarness) {
114114
bh.iter(|| {
115-
~10;
115+
~10
116116
})
117117
}
118118

119119
#[bench]
120120
fn alloc_owned_big(bh: &mut BenchHarness) {
121121
bh.iter(|| {
122-
~[10, ..1000];
122+
~[10, ..1000]
123123
})
124124
}
125125
}

‎branches/try/src/libstd/rt/unwind.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,6 @@ mod libunwind {
143143
pub type _Unwind_Exception_Cleanup_Fn = extern "C" fn(unwind_code: _Unwind_Reason_Code,
144144
exception: *_Unwind_Exception);
145145

146-
#[cfg(target_os = "linux")]
147-
#[cfg(target_os = "freebsd")]
148-
#[cfg(target_os = "win32")]
149-
#[link(name = "gcc_s")]
150-
extern {}
151-
152-
#[cfg(target_os = "android")]
153-
#[link(name = "gcc")]
154-
extern {}
155-
156146
extern "C" {
157147
pub fn _Unwind_RaiseException(exception: *_Unwind_Exception) -> _Unwind_Reason_Code;
158148
pub fn _Unwind_DeleteException(exception: *_Unwind_Exception);

‎branches/try/src/libstd/rtdeps.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ extern {}
2222
// On linux librt and libdl are indirect dependencies via rustrt,
2323
// and binutils 2.22+ won't add them automatically
2424
#[cfg(target_os = "linux")]
25-
#[link(name = "c")]
2625
#[link(name = "dl")]
2726
#[link(name = "m")]
2827
#[link(name = "pthread")]
@@ -32,7 +31,6 @@ extern {}
3231
#[link(name = "dl")]
3332
#[link(name = "log")]
3433
#[link(name = "m")]
35-
#[link(name = "c")]
3634
extern {}
3735

3836
#[cfg(target_os = "freebsd")]
@@ -41,5 +39,5 @@ extern {}
4139
extern {}
4240

4341
#[cfg(target_os = "macos")]
44-
#[link(name = "System")]
42+
#[link(name = "pthread")]
4543
extern {}

‎branches/try/src/libstd/str.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4357,7 +4357,7 @@ mod bench {
43574357
43584358
assert_eq!(100, s.len());
43594359
bh.iter(|| {
4360-
let _ = is_utf8(s);
4360+
is_utf8(s)
43614361
});
43624362
}
43634363
@@ -4366,7 +4366,7 @@ mod bench {
43664366
let s = bytes!("𐌀𐌖𐌋𐌄𐌑𐌉ปรدولة الكويتทศไทย中华𐍅𐌿𐌻𐍆𐌹𐌻𐌰");
43674367
assert_eq!(100, s.len());
43684368
bh.iter(|| {
4369-
let _ = is_utf8(s);
4369+
is_utf8(s)
43704370
});
43714371
}
43724372
@@ -4409,7 +4409,7 @@ mod bench {
44094409
#[bench]
44104410
fn bench_with_capacity(bh: &mut BenchHarness) {
44114411
bh.iter(|| {
4412-
let _ = with_capacity(100);
4412+
with_capacity(100)
44134413
});
44144414
}
44154415

‎branches/try/src/libstd/vec.rs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4428,22 +4428,23 @@ mod bench {
44284428
let mut vec: ~[uint] = ~[0u];
44294429
bh.iter(|| {
44304430
vec.push(0);
4431+
&vec
44314432
})
44324433
}
44334434

44344435
#[bench]
44354436
fn starts_with_same_vector(bh: &mut BenchHarness) {
44364437
let vec: ~[uint] = vec::from_fn(100, |i| i);
44374438
bh.iter(|| {
4438-
vec.starts_with(vec);
4439+
vec.starts_with(vec)
44394440
})
44404441
}
44414442

44424443
#[bench]
44434444
fn starts_with_single_element(bh: &mut BenchHarness) {
44444445
let vec: ~[uint] = ~[0u];
44454446
bh.iter(|| {
4446-
vec.starts_with(vec);
4447+
vec.starts_with(vec)
44474448
})
44484449
}
44494450

@@ -4453,23 +4454,23 @@ mod bench {
44534454
let mut match_vec: ~[uint] = vec::from_fn(99, |i| i);
44544455
match_vec.push(0);
44554456
bh.iter(|| {
4456-
vec.starts_with(match_vec);
4457+
vec.starts_with(match_vec)
44574458
})
44584459
}
44594460

44604461
#[bench]
44614462
fn ends_with_same_vector(bh: &mut BenchHarness) {
44624463
let vec: ~[uint] = vec::from_fn(100, |i| i);
44634464
bh.iter(|| {
4464-
vec.ends_with(vec);
4465+
vec.ends_with(vec)
44654466
})
44664467
}
44674468

44684469
#[bench]
44694470
fn ends_with_single_element(bh: &mut BenchHarness) {
44704471
let vec: ~[uint] = ~[0u];
44714472
bh.iter(|| {
4472-
vec.ends_with(vec);
4473+
vec.ends_with(vec)
44734474
})
44744475
}
44754476

@@ -4479,15 +4480,15 @@ mod bench {
44794480
let mut match_vec: ~[uint] = vec::from_fn(100, |i| i);
44804481
match_vec[0] = 200;
44814482
bh.iter(|| {
4482-
vec.starts_with(match_vec);
4483+
vec.starts_with(match_vec)
44834484
})
44844485
}
44854486

44864487
#[bench]
44874488
fn contains_last_element(bh: &mut BenchHarness) {
44884489
let vec: ~[uint] = vec::from_fn(100, |i| i);
44894490
bh.iter(|| {
4490-
vec.contains(&99u);
4491+
vec.contains(&99u)
44914492
})
44924493
}
44934494

@@ -4507,13 +4508,14 @@ mod bench {
45074508
ptr::set_memory(vp, 0, 1024);
45084509
v.set_len(1024);
45094510
}
4511+
v
45104512
});
45114513
}
45124514

45134515
#[bench]
45144516
fn zero_1kb_fixed_repeat(bh: &mut BenchHarness) {
45154517
bh.iter(|| {
4516-
let _v: ~[u8] = ~[0u8, ..1024];
4518+
~[0u8, ..1024]
45174519
});
45184520
}
45194521

@@ -4542,6 +4544,7 @@ mod bench {
45424544
for x in v.mut_iter() {
45434545
*x = 0;
45444546
}
4547+
v
45454548
});
45464549
}
45474550

‎branches/try/src/llvm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit f5f1ffea207b6b380127ff34f14015ae005d1413
1+
Subproject commit e1dabb48f0f898d1a808b3de3a26f5ee3735c7dd

‎branches/try/src/rustllvm/llvm-auto-clean-trigger

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
22
# The actual contents of this file do not matter, but to trigger a change on the
33
# build bots then the contents should be changed so git updates the mtime.
4-
2014-02-11
4+
2014-01-27

0 commit comments

Comments
 (0)