Emscripten support take 2 (with bonus i686-unknown-linux-musl). #30629

brson · Dec 30, 2015

Here's another go at adding emscripten support. This needs to wait again on new libc definitions landing. To get the libc definitions right I had to add support for i686-unknown-linux-musl, which are very similar to emscripten's, which are derived from arm/musl.

This branch additionally removes the makefile dependency on the EMSCRIPTEN environment variable by not building the unused compiler-rt.

Again, this is not sufficient for actually compiling to asmjs since it needs additional LLVM patches.

r? @alexcrichton

aidanhs · Jan 8, 2016

aidanhs reviewed Jan 8, 2016

View changes

aidanhs · Jan 8, 2016

src/librustc_trans/back/write.rs

-        llvm::LLVMWriteBitcodeToFile(llmod, out.as_ptr());
+    // Change what we write and cleanup based on whether obj files are
+    // just llvm bitcode. In that case write bitcode, and possibly
+    // delete the bitcode if it wasn't requisted. Don't generate the


requested (sorry about the nit, my eyes just fell on it)

aidanhs · Jan 8, 2016

aidanhs reviewed Jan 8, 2016

View changes

aidanhs · Jan 8, 2016

src/libstd/sys/unix/thread.rs

@@ -180,7 +182,7 @@ pub mod guard {
 }


-#[cfg(any(target_os = "linux",
+#[cfg(any(all(target_os = "linux", not(target_env = "musl")),


Unfortunately I'm without the ability to build musl-rust right now, so I'm forced to ask rather than just trying - what about this won't work on musl?

I haven't looked too deeply, but I was getting crashes in one of the pthread calls in this code path, and since it's some hairy code I just punted.

alexcrichton · Jan 10, 2016

alexcrichton reviewed Jan 10, 2016

View changes

alexcrichton · Jan 10, 2016

src/librustc_back/target/i686_unknown_linux_musl.rs

+    // To deal with these circular dependencies we just force the compiler to
+    // link everything as a group, not stripping anything out until everything
+    // is processed. The linker will still perform a pass to strip out object
+    // files but it won't do so until all objects/archives have been processed.


Could the comments in this file be deduplicated with the 64-bit MUSL? e.g. just leave pointers saying that an explanation of all the weird options are over there.

alexcrichton · Jan 10, 2016

r=me with one minor nit, but otherwise this'll just need libc to land first as well

bors · Jan 13, 2016

☔️ The latest upstream changes (presumably #30601) made this pull request unmergeable. Please resolve the merge conflicts.

brson · Feb 6, 2016

Rebasing this now.

brson · Feb 6, 2016

Well, I've rebased and addressed comments, and this builds, but testing against emscripten incoming it no longer produces working js.

Still, I'm up for landing this for the wip.

brson · Feb 6, 2016

@bors r=alexcrichton

bors · Feb 6, 2016

📌 Commit b9dd828 has been approved by alexcrichton

brson · Feb 6, 2016

@bors r- I've got a commit that changes jemalloc in there.

brson · Feb 6, 2016

cc emscripten-core/emscripten#4082

brson · Feb 6, 2016

@bors r=alexcrichton

bors · Feb 6, 2016

📌 Commit 7afb56f has been approved by alexcrichton

bors · Feb 6, 2016

⌛️ Testing commit 7afb56f with merge 8c604dc...

bors · Feb 6, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt

tamird · May 1, 2016

@brson @alexcrichton a bit late to this party, but base.pre_link_args.push("-Wl,-melf_i386".to_string()); is the only bit of this that isn't shared with the 64-bit version and it isn't clear why. Can you shed some light on this difference?

alexcrichton · May 2, 2016

AFAIK that's just to tell the linker to emit a 32-bit executable in case it's default a 64-bit one

tamird · May 3, 2016

Does that make it redundant with -m32?

On Mon, May 2, 2016 at 1:10 AM, Alex Crichton notifications@github.com
wrote:

AFAIK that's just to tell the linker to emit a 32-bit executable in case
it's default a 64-bit one

—
You are receiving this because you commented.
Reply to this email directly or view it on GitHub
#30629 (comment)

alexcrichton · May 3, 2016

In this case, probably yes

brson · May 3, 2016

@tamird Memory is hazy, but if I didn't write that it didn't work, and I don't know if it's redundant with -m32.

rust-highfive assigned alexcrichton Dec 30, 2015

This was referenced Dec 30, 2015

Merged

Update the emscripten port of glutin tomaka/glutin#668

Closed

Make Rust work with emscripten rust-lang/rfcs#604

brson force-pushed the brson:emscripten-upstream branch 2 times, most recently from e1ced26 to b9dd828 Feb 6, 2016

brson force-pushed the brson:emscripten-upstream branch from b9dd828 to 7afb56f Feb 6, 2016

bors merged commit 7afb56f into rust-lang:master Feb 6, 2016
1 of 2 checks passed

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build is in progress
Details

homu Test successful
Details

This was referenced Feb 6, 2016

Closed

std: Move pc-windows-gnu to SEH-based unwinding #31313

Merged

Implement CommandExt::{exec, before_exec} #31409

brson referenced this pull request Feb 9, 2016
Open
Guard pages are disabled on musl. #31506

rust-lang/rust

Join GitHub today

Emscripten support take 2 (with bonus i686-unknown-linux-musl). #30629

Conversation

brson commented Dec 30, 2015

rust-highfive assigned alexcrichton Dec 30, 2015

This was referenced Dec 30, 2015

aidanhs reviewed Jan 8, 2016 View changes

This comment has been minimized.

aidanhs reviewed Jan 8, 2016 View changes

This comment has been minimized.

This comment has been minimized.

alexcrichton reviewed Jan 10, 2016 View changes

This comment has been minimized.

This comment has been minimized.

alexcrichton commented Jan 10, 2016

This comment has been minimized.

bors commented Jan 13, 2016

This comment has been minimized.

brson commented Feb 6, 2016

brson force-pushed the brson:emscripten-upstream branch 2 times, most recently from e1ced26 to b9dd828 Feb 6, 2016

This comment has been minimized.

brson commented Feb 6, 2016

This comment has been minimized.

brson commented Feb 6, 2016

This comment has been minimized.

bors commented Feb 6, 2016

This comment has been minimized.

brson commented Feb 6, 2016

This comment has been minimized.

brson commented Feb 6, 2016

brson force-pushed the brson:emscripten-upstream branch from b9dd828 to 7afb56f Feb 6, 2016

This comment has been minimized.

brson commented Feb 6, 2016

This comment has been minimized.

bors commented Feb 6, 2016

brson added some commits Nov 26, 2015

This comment has been minimized.

bors commented Feb 6, 2016

bors added a commit that referenced this pull request Feb 6, 2016

This comment has been minimized.

bors commented Feb 6, 2016

Hide details View details bors merged commit 7afb56f into rust-lang:master Feb 6, 2016 1 of 2 checks passed

1 of 2 checks passed

This was referenced Feb 6, 2016

brson referenced this pull request Feb 9, 2016

This comment has been minimized.

tamird commented May 1, 2016

This comment has been minimized.

alexcrichton commented May 2, 2016

This comment has been minimized.

tamird commented May 3, 2016

This comment has been minimized.

alexcrichton commented May 3, 2016

This comment has been minimized.

brson commented May 3, 2016

aidanhs reviewed Jan 8, 2016

View changes

aidanhs reviewed Jan 8, 2016

View changes

alexcrichton reviewed Jan 10, 2016

View changes

brson force-pushed the brson:emscripten-upstream branch 2 times, most recently from `e1ced26` to `b9dd828` Feb 6, 2016

brson force-pushed the brson:emscripten-upstream branch from `b9dd828` to `7afb56f` Feb 6, 2016

bors merged commit `7afb56f` into rust-lang:master Feb 6, 2016
1 of 2 checks passed