Skip to content

Commit ff0b0d5

Browse files
committed
auto merge of #13558 : alexcrichton/rust/snapshots, r=brson
This is the first snapshot build by mingw-w64 with the win32 threading model I believe (Closes #13501). Curiously, this successfully built a snapshot on freebsd when the auto builder is continuously segfaulting. Who knew!
2 parents 903fbd2 + 2286b0c commit ff0b0d5

File tree

2 files changed

+9
-25
lines changed

2 files changed

+9
-25
lines changed

src/libstd/intrinsics.rs

+1-25
Original file line numberDiff line numberDiff line change
@@ -394,9 +394,7 @@ extern "rust-intrinsic" {
394394

395395
pub fn roundf32(x: f32) -> f32;
396396
pub fn roundf64(x: f64) -> f64;
397-
}
398-
#[cfg(not(stage0))]
399-
extern "rust-intrinsic" {
397+
400398
pub fn ctpop8(x: u8) -> u8;
401399
pub fn ctpop16(x: u16) -> u16;
402400
pub fn ctpop32(x: u32) -> u32;
@@ -415,29 +413,7 @@ extern "rust-intrinsic" {
415413
pub fn bswap16(x: u16) -> u16;
416414
pub fn bswap32(x: u32) -> u32;
417415
pub fn bswap64(x: u64) -> u64;
418-
}
419416

420-
// NOTE: remove this after a snap, and merge the extern block above
421-
macro_rules! stage0_hack {
422-
($( $u_ty:ty, $i_ty:ty => $($name:ident),*);*) => {
423-
$(
424-
$(
425-
#[cfg(stage0)]
426-
pub unsafe fn $name(x: $u_ty) -> $u_ty {
427-
extern "rust-intrinsic" { fn $name(x: $i_ty) -> $i_ty; }
428-
$name(x as $i_ty) as $u_ty
429-
}
430-
)*)*
431-
}
432-
}
433-
stage0_hack! {
434-
u8, i8 => ctpop8, ctlz8, cttz8;
435-
u16, i16 => ctpop16, ctlz16, cttz16, bswap16;
436-
u32, i32 => ctpop32, ctlz32, cttz32, bswap32;
437-
u64, i64 => ctpop64, ctlz64, cttz64, bswap64
438-
}
439-
440-
extern "rust-intrinsic" {
441417
pub fn i8_add_with_overflow(x: i8, y: i8) -> (i8, bool);
442418
pub fn i16_add_with_overflow(x: i16, y: i16) -> (i16, bool);
443419
pub fn i32_add_with_overflow(x: i32, y: i32) -> (i32, bool);

src/snapshots.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2014-04-15 349d66a
2+
freebsd-x86_64 0e8078e24b3f86481c5ae0a47a15e5ed2703f241
3+
linux-i386 b4e5d104fc2b1eb0236b662ab3cbbb729f789bd6
4+
linux-x86_64 c1492f09cfbce535bcf32403cd3aaff84f2094f1
5+
macos-i386 e7a093b6c3d45786eeebd73760c4643514ed0c9a
6+
macos-x86_64 9401f60e9b6a1d1ae9890a25a512f87c47facc2d
7+
winnt-i386 801f7dcaa3117e277981660033869695a9cb865a
8+
19
S 2014-04-10 e263ef1
210
freebsd-x86_64 dc7cfe4266b28f1361b8c2d9ec5bd9ae8ec64e70
311
linux-i386 ca0c3b5258dc3eb4a62f0508a662431a4b9cf227

0 commit comments

Comments
 (0)