Redox Cross Compilation #38401

jackpot51 · Dec 15, 2016

I will admit - there are things here that I wish I did not have to do. This completes the ability to create a cross compiler from the rust repository for x86_64-unknown-redox. I will document this PR with inline comments explaining some things.

View this gist to see how a cross compiler is built

Prior discussion of a smaller change is here: #38366

rust-highfive · Dec 15, 2016

r? @sfackler

(rust_highfive has picked a reviewer for you, use r? to override)

jackpot51 · Dec 16, 2016

jackpot51 reviewed Dec 16, 2016

View changes

Hopefully these comments will help you navigate the changes.

jackpot51 · Dec 16, 2016

mk/cfg/x86_64-unknown-redox.mk

@@ -0,0 +1 @@
+# rustbuild-only target


The old build system is complicated to use, so there is no support for using it.

jackpot51 · Dec 16, 2016

src/liballoc_jemalloc/build.rs

@@ -36,7 +36,8 @@ fn main() {
    // targets, which means we have to build the alloc_jemalloc crate
    // for targets like emscripten, even if we don't use it.
    if target.contains("rumprun") || target.contains("bitrig") || target.contains("openbsd") ||
-       target.contains("msvc") || target.contains("emscripten") || target.contains("fuchsia") {
+       target.contains("msvc") || target.contains("emscripten") || target.contains("fuchsia") ||
+       target.contains("redox") {


We do not support jemalloc, so we will build with the dummy.

jackpot51 · Dec 16, 2016

src/liballoc_system/lib.rs

@@ -71,7 +72,49 @@ pub extern "C" fn __rust_usable_size(size: usize, align: usize) -> usize {
    imp::usable_size(size, align)
 }

-#[cfg(unix)]
+#[cfg(target_os = "redox")]
+mod imp {


Just so we have a stub for potentially using a libc allocator, we implement alloc_system similarly to how the unix implementation works. If desired, these two imp blocks could be combined.

You're the one defining the abi of the system allocator, so this is largely up to you. If you follow unix's malloc/free conventions then I'd recommend unifying with the above block for Unix. That handles bits and pieces such as alignment for more-aligned types (e.g. simd types).

I will probably change this to be different from Unix so that it defines externs that ralloc will fulfill.

jackpot51 · Dec 16, 2016

src/liballoc_system/lib.rs

+    use MIN_ALIGN;
+
+    pub unsafe fn allocate(size: usize, _align: usize) -> *mut u8 {
+        libc::malloc(size as libc::size_t) as *mut u8


memalign is not used like in the unix implementation, perhaps this is a problem

Yes I this is one case where I think you'll want to align with the implementation above. This really ends up just needing an allocator interface which supports alignment as an argument, and that's what memalign is targeted at.

Understood, thanks

jackpot51 · Dec 16, 2016

src/liballoc_system/lib.rs

@@ -19,6 +19,7 @@
            issue = "27783")]
 #![feature(allocator)]
 #![feature(staged_api)]
+#![cfg_attr(target_os = "redox", feature(libc))]


Note that ralloc is used as the default allocator in librust_back. What we have done here is to ensure that liballoc_system builds, as it is a required dependency of libstd. We never link to it, however.

jackpot51 · Dec 16, 2016

src/libstd/sys/redox/syscall/scheme.rs

@@ -0,0 +1,232 @@
+use core::{mem, slice};


This is the definition of a Redox scheme. It could probably be removed.

jackpot51 · Dec 16, 2016

src/libstd/sys/redox/syscall/x86.rs

@@ -0,0 +1,72 @@
+use super::error::{Error, Result};


This is the system call ABI definition for x86

jackpot51 · Dec 16, 2016

src/libstd/sys/redox/syscall/x86_64.rs

@@ -0,0 +1,72 @@
+use super::error::{Error, Result};


This is the system call ABI definition for x86_64

jackpot51 · Dec 16, 2016

src/libtest/lib.rs

@@ -914,6 +914,11 @@ fn use_color(opts: &TestOpts) -> bool {
    }
 }

+#[cfg(target_os = "redox")]
+fn stdout_isatty() -> bool {


Redox needs to support isatty. We return false as a safe alternative

jackpot51 · Dec 16, 2016

src/libtest/lib.rs

@@ -1103,6 +1108,12 @@ fn get_concurrency() -> usize {
        }
    }

+    #[cfg(target_os = "redox")]
+    fn num_cpus() -> usize {


Redox needs to provide a way to get the number of CPUs. We return 1 as a safe alternative

jackpot51 · Dec 22, 2016

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 · Dec 22, 2016

src/liballoc_system/lib.rs

@@ -19,7 +19,7 @@
            issue = "27783")]
 #![feature(allocator)]
 #![feature(staged_api)]
-#![cfg_attr(unix, feature(libc))]
+#![cfg_attr(any(unix, target_os = "redox"), feature(libc))]


For alloc_system, we simply reuse the unix setup to allow a libc implementation of an allocator

jackpot51 · Dec 22, 2016

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 · Dec 22, 2016

src/liballoc_system/lib.rs

@@ -87,7 +87,7 @@ mod imp {
        }
    }

-    #[cfg(target_os = "android")]
+    #[cfg(any(target_os = "android", target_os = "redox"))]


Newlib does not contain posix_memalign, so we use memalign

jackpot51 · Dec 22, 2016

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 · Dec 22, 2016

src/librustc_back/target/redox_base.rs

+        linker_is_gnu: true,
+        no_default_libraries: true,
+        lib_allocation_crate: "alloc_system".to_string(),
+        exe_allocation_crate: "alloc_system".to_string(),


We use alloc_system as the default allocator. I personally would like to use ralloc

jackpot51 · Dec 22, 2016

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 · Dec 22, 2016

src/libstd/sys/redox/rt.rs

+#[no_mangle]
+#[naked]
+#[cfg(target_arch = "x86")]
+pub unsafe fn _start() {


Hygiene error! In order to generate executables, we have to have a naked _start function at the libstd root.

jackpot51 · Dec 22, 2016

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 · Dec 22, 2016

src/libstd/sys/redox/rt.rs

+#[naked]
+#[cfg(target_arch = "x86_64")]
+pub unsafe fn _start() {
+    asm!("mov rdi, rsp


Hygiene error! In order to generate executables, we have to have a naked _start function at the libstd root.

RobertWHurst · Dec 22, 2016

Can't wait for this to land 👌🏻

jackpot51 · Dec 22, 2016

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 · Dec 22, 2016

src/librustc_back/target/redox_base.rs

+            // Static link
+            "-static".to_string()
+        ],
+        late_link_args: vec![


We late link libc and libm so that they can be provided when binaries are linked, rather than using the compiler defaults.

brson · Dec 23, 2016

This looks great to me.

The only thing that bothers me here is target_family. I still don't want to define a new family. I think we should change the logic in the driver so that None means target_family is not defined, and change all the unix target definitions to define it as unix.

jackpot51 · Dec 23, 2016

Ok @brson - Please see c59bb49. A minor mistake was fixed in 4dcb867.

I changed all of the Unix platforms to target_family: Some("unix".to_string()) and the Windows platforms to Some("windows".to_string()). I changed Redox to None. I think I covered all the "bases" ;-).

I changed librustc/session/config.rs to accept target_family only from the target configuration, to insert it as cfg(target_family = "...") and if it is windows or unix, to insert it as cfg(...)

jackpot51 · Dec 23, 2016

jackpot51 reviewed Dec 23, 2016

View changes

jackpot51 · Dec 23, 2016

src/librustc/session/config.rs

@@ -943,26 +943,20 @@ pub fn default_configuration(sess: &Session) -> ast::CrateConfig {
    let vendor = &sess.target.target.target_vendor;
    let max_atomic_width = sess.target.target.max_atomic_width();

-    let fam = if let Some(ref fam) = sess.target.target.options.target_family {
-        Symbol::intern(fam)
-    } else if sess.target.target.options.is_like_windows {


Since the windows platforms now correctly define target_family, this is no longer necessary.

jackpot51 · Dec 23, 2016

jackpot51 reviewed Dec 23, 2016

View changes

jackpot51 · Dec 23, 2016

src/librustc_back/target/redox_base.rs

@@ -38,7 +38,7 @@ pub fn opts() -> TargetOptions {
        relocation_model: "static".to_string(),
        disable_redzone: true,
        eliminate_frame_pointer: false,
-        target_family: Some("redox".to_string()),
+        target_family: None,


Redox no longer has a family :-(

jackpot51 · Dec 23, 2016

jackpot51 reviewed Dec 23, 2016

View changes

jackpot51 · Dec 23, 2016

src/librustc_back/target/windows_base.rs

@@ -24,6 +24,7 @@ pub fn opts() -> TargetOptions {
        staticlib_prefix: "".to_string(),
        staticlib_suffix: ".lib".to_string(),
        no_default_libraries: true,
+        target_family: Some("windows".to_string()),


Both the windows bases are covered

jackpot51 · Dec 23, 2016

jackpot51 reviewed Dec 23, 2016

View changes

jackpot51 · Dec 23, 2016

src/librustc_back/target/apple_base.rs

@@ -37,6 +37,7 @@ pub fn opts() -> TargetOptions {
        function_sections: false,
        dynamic_linking: true,
        executables: true,
+        target_family: Some("unix".to_string()),


Everything that isn't windows, is set to unix. That includes Linux, OS X, iOS, DragonflyBSD, NetBSD, OpenBSD, FreeBSD, Bitrig, Solaris, Fuchsia, and Haiku

brson · Dec 23, 2016

@bors r+

I'm very happy with how this is turning out so far. I wish there wasn't so much cfg sprawl in non-std crates, but that's something we can figure out in the future.

Tagging with relnotes not only for the redox support, but also the breaking change to target_family.

bors · Dec 23, 2016

📌 Commit 4dcb867 has been approved by brson

bors · Dec 23, 2016

⌛️ Testing commit 4dcb867 with merge 99913c5...

bors · Dec 23, 2016

jackpot51 · Dec 23, 2016

Thanks @brson

rust-highfive assigned sfackler Dec 15, 2016

jackpot51 referenced this pull request Dec 16, 2016
Closed
Redox x86_64 target support #38366

jackpot51 referenced this pull request Dec 21, 2016
Merged
Add memalign to Redox (for use in allocator) #478

bors added a commit to rust-lang/libc that referenced this pull request Dec 21, 2016

Auto merge of #478 - jackpot51:patch-1, r=alexcrichton
Add memalign to Redox (for use in allocator) This is required to satisfy a review item here: rust-lang/rust#38401

Loading status checks…

e49e9bb

jackpot51 added some commits Dec 21, 2016

Update liblibc, go back to lazy linking openlibm

e909e43

Merge branch 'redox_cross' of https://github.com/redox-os/rust into r…
…edox_cross

Loading status checks…

92c8e0f

jackpot51 added some commits Dec 22, 2016

Add RawFd traits for net

Loading status checks…

7d3ae87

In order to successfully build, go back to ralloc

Loading status checks…

e7b006d

Remove start functions, use newlib instead of openlibm + ralloc

Loading status checks…

1eb6c44

Revert rt.rs

Loading status checks…

2ddd117

jackpot51 added some commits Dec 23, 2016

Do not build emutls on Redox

Loading status checks…

474eb62

Correct target_family mess

Loading status checks…

c59bb49

Convert fam to Symbol

Loading status checks…

4dcb867

brson added the relnotes label Dec 23, 2016

bors merged commit 4dcb867 into rust-lang:master Dec 23, 2016
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

japaric referenced this pull request Dec 23, 2016
Closed
When target_family is None, rustc sets it to unix. #38187

jackpot51 deleted the redox-os:redox_cross branch Dec 23, 2016

jackpot51 referenced this pull request Dec 23, 2016
Closed
Update liblibc to add Redox memalign #38563

Mark-Simulacrum referenced this pull request Jun 7, 2018
Closed
Missing tokens in custom derive input generated by macro #51331

rust-lang/rust

Join GitHub today

Redox Cross Compilation #38401

Conversation

jackpot51 commented Dec 15, 2016 • edited

jackpot51 added some commits Dec 13, 2016

rust-highfive assigned sfackler Dec 15, 2016

This comment has been minimized.

rust-highfive commented Dec 15, 2016

jackpot51 reviewed Dec 16, 2016 View changes

jackpot51 left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

jackpot51 referenced this pull request Dec 16, 2016

jackpot51 added some commits Dec 20, 2016

jackpot51 referenced this pull request Dec 21, 2016

bors added a commit to rust-lang/libc that referenced this pull request Dec 21, 2016

jackpot51 added some commits Dec 21, 2016

jackpot51 reviewed Dec 22, 2016 View changes

This comment has been minimized.

jackpot51 reviewed Dec 22, 2016 View changes

This comment has been minimized.

jackpot51 Dec 22, 2016 • edited

jackpot51 reviewed Dec 22, 2016 View changes

This comment has been minimized.

jackpot51 reviewed Dec 22, 2016 View changes

This comment has been minimized.

jackpot51 reviewed Dec 22, 2016 View changes

This comment has been minimized.

jackpot51 added some commits Dec 22, 2016

This comment has been minimized.

RobertWHurst commented Dec 22, 2016

jackpot51 reviewed Dec 22, 2016 View changes

This comment has been minimized.

This comment has been minimized.

brson commented Dec 23, 2016

jackpot51 added some commits Dec 23, 2016

This comment has been minimized.

jackpot51 commented Dec 23, 2016 • edited

jackpot51 reviewed Dec 23, 2016 View changes

This comment has been minimized.

jackpot51 reviewed Dec 23, 2016 View changes

This comment has been minimized.

jackpot51 Dec 23, 2016 • edited

This comment has been minimized.

jackpot51 reviewed Dec 23, 2016 View changes

This comment has been minimized.

jackpot51 reviewed Dec 23, 2016 View changes

This comment has been minimized.

jackpot51 Dec 23, 2016 • edited

brson added the relnotes label Dec 23, 2016

This comment has been minimized.

brson commented Dec 23, 2016

This comment has been minimized.

bors commented Dec 23, 2016

This comment has been minimized.

bors commented Dec 23, 2016

bors added a commit that referenced this pull request Dec 23, 2016

This comment has been minimized.

bors commented Dec 23, 2016

Hide details View details bors merged commit 4dcb867 into rust-lang:master Dec 23, 2016 2 checks passed

2 checks passed

japaric referenced this pull request Dec 23, 2016

This comment has been minimized.

jackpot51 commented Dec 23, 2016

jackpot51 deleted the redox-os:redox_cross branch Dec 23, 2016

jackpot51 referenced this pull request Dec 23, 2016

jsonn pushed a commit to jsonn/pkgsrc that referenced this pull request Mar 20, 2017

jackpot51 commented Dec 15, 2016 •

edited

jackpot51 reviewed Dec 16, 2016

View changes

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 Dec 22, 2016 •

edited

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 reviewed Dec 22, 2016

View changes

jackpot51 commented Dec 23, 2016 •

edited

jackpot51 reviewed Dec 23, 2016

View changes

jackpot51 reviewed Dec 23, 2016

View changes

jackpot51 Dec 23, 2016 •

edited

jackpot51 reviewed Dec 23, 2016

View changes

jackpot51 reviewed Dec 23, 2016

View changes

jackpot51 Dec 23, 2016 •

edited

bors merged commit `4dcb867` into rust-lang:master Dec 23, 2016
2 checks passed