Skip to content

Commit ad7c55e

Browse files
committedAug 7, 2019
Auto merge of #60547 - redox-os:redox-unix, r=alexcrichton
redox: convert to target_family unix This is the second step to supporting #60139. In order to have a smooth transition, there will need to be a change made in liblibc at the same time, switching Redox over to the unix target family. See rust-lang/libc#1332
2 parents 647ed20 + ebb648d commit ad7c55e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+590
-6440
lines changed
 

‎src/doc/unstable-book/src/library-features/n16.md

-5
This file was deleted.

‎src/libpanic_abort/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ pub unsafe extern fn __rust_start_panic(_payload: usize) -> u32 {
4848
libc::abort();
4949
}
5050

51-
#[cfg(any(target_os = "redox",
52-
windows,
51+
#[cfg(any(windows,
5352
all(target_arch = "wasm32", not(target_os = "emscripten"))))]
5453
unsafe fn abort() -> ! {
5554
core::intrinsics::abort();

0 commit comments

Comments
 (0)