---

yaml
---
r: 274746
b: refs/heads/stable
c: 1de70d3
h: refs/heads/master

Author: bors

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 3df40c09ec5efb74e16c3da84fef6ce142dae73a
+refs/heads/stable: 1de70d33f7baf12978cfb3de861e61b2a5d6fca7
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/configure

@@ -1305,6 +1305,12 @@ $ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake
             putvar CFG_DISABLE_JEMALLOC
             ;;
 
+        *-emscripten)
+            step_msg "targeting emscripten, disabling jemalloc"
+            CFG_DISABLE_JEMALLOC=1
+            putvar CFG_DISABLE_JEMALLOC
+            ;;
+
         *)
             ;;
     esac

branches/stable/man/rustc.1

@@ -6,9 +6,7 @@ rustc \- The Rust compiler
 [\fIOPTIONS\fR] \fIINPUT\fR
 
 .SH DESCRIPTION
-This program is a compiler for the Rust language, available at
-.UR https://www.rust\-lang.org
-.UE .
+This program is a compiler for the Rust language, available at https://www.rust\-lang.org.
 
 .SH OPTIONS
 
@@ -298,10 +296,7 @@ To build an executable with debug info:
 .BR rustdoc (1)
 
 .SH "BUGS"
-See
-.UR https://github.com/rust\-lang/rust/issues
-.UE
-for issues.
+See https://github.com/rust\-lang/rust/issues for issues.
 
 .SH "AUTHOR"
 See \fIAUTHORS.txt\fR in the Rust source distribution.

branches/stable/man/rustdoc.1

@@ -8,10 +8,8 @@ rustdoc \- generate documentation from Rust source code
 .SH DESCRIPTION
 This tool generates API reference documentation by extracting comments from
 source code written in the Rust language, available at
-.UR https://www.rust\-lang.org
-.UE .
-It accepts several input formats and provides several output formats
-for the generated documentation.
+<\fBhttps://www.rust-lang.org\fR>. It accepts several input formats and
+provides several output formats for the generated documentation.
 
 .SH OPTIONS
 
@@ -131,9 +129,7 @@ The generated HTML can be viewed with any standard web browser.
 .BR rustc (1)
 
 .SH "BUGS"
-See
-.UR https://github.com/rust\-lang/rust/issues
-.UE
+See <\fBhttps://github.com/rust\-lang/rust/issues\fR>
 for issues.
 
 .SH "AUTHOR"

branches/stable/mk/cfg/asmjs-unknown-emscripten.mk

@@ -0,0 +1,23 @@
+# asmjs-unknown-emscripten configuration
+CC_asmjs-unknown-emscripten=emcc
+CXX_asmjs-unknown-emscripten=em++
+CPP_asmjs-unknown-emscripten=$(CPP)
+AR_asmjs-unknown-emscripten=emar
+CFG_LIB_NAME_asmjs-unknown-emscripten=lib$(1).so
+CFG_STATIC_LIB_NAME_asmjs-unknown-emscripten=lib$(1).a
+CFG_LIB_GLOB_asmjs-unknown-emscripten=lib$(1)-*.so
+CFG_LIB_DSYM_GLOB_asmjs-unknown-emscripten=lib$(1)-*.dylib.dSYM
+CFG_JEMALLOC_CFLAGS_asmjs-unknown-emscripten := -m32 $(CFLAGS)
+CFG_GCCISH_CFLAGS_asmjs-unknown-emscripten := -Wall -Werror -g -fPIC -m32 $(CFLAGS)
+CFG_GCCISH_CXXFLAGS_asmjs-unknown-emscripten := -fno-rtti $(CXXFLAGS)
+CFG_GCCISH_LINK_FLAGS_asmjs-unknown-emscripten := -shared -fPIC -ldl -pthread  -lrt -g -m32
+CFG_GCCISH_DEF_FLAG_asmjs-unknown-emscripten := -Wl,--export-dynamic,--dynamic-list=
+CFG_LLC_FLAGS_asmjs-unknown-emscripten :=
+CFG_INSTALL_NAME_asmjs-unknown-emscripten =
+CFG_EXE_SUFFIX_asmjs-unknown-emscripten =
+CFG_WINDOWSY_asmjs-unknown-emscripten :=
+CFG_UNIXY_asmjs-unknown-emscripten := 1
+CFG_LDPATH_asmjs-unknown-emscripten :=
+CFG_RUN_asmjs-unknown-emscripten=$(2)
+CFG_RUN_TARG_asmjs-unknown-emscripten=$(call CFG_RUN_asmjs-unknown-emscripten,,$(2))
+CFG_GNU_TRIPLE_asmjs-unknown-emscripten := asmjs-unknown-emscripten

branches/stable/mk/cfg/i686-unknown-linux-musl.mk

@@ -0,0 +1,28 @@
+# i686-unknown-linux-musl configuration
+CC_i686-unknown-linux-musl=$(CFG_MUSL_ROOT)/bin/musl-gcc
+CXX_i686-unknown-linux-musl=notaprogram
+CPP_i686-unknown-linux-musl=$(CFG_MUSL_ROOT)/bin/musl-gcc -E
+AR_i686-unknown-linux-musl=$(AR)
+CFG_INSTALL_ONLY_RLIB_i686-unknown-linux-musl = 1
+CFG_LIB_NAME_i686-unknown-linux-musl=lib$(1).so
+CFG_STATIC_LIB_NAME_i686-unknown-linux-musl=lib$(1).a
+CFG_LIB_GLOB_i686-unknown-linux-musl=lib$(1)-*.so
+CFG_JEMALLOC_CFLAGS_i686-unknown-linux-musl := -m32 -Wl,-melf_i386
+CFG_GCCISH_CFLAGS_i686-unknown-linux-musl := -Wall -Werror -g -fPIC -m32 -Wl,-melf_i386
+CFG_GCCISH_CXXFLAGS_i686-unknown-linux-musl :=
+CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-musl :=
+CFG_GCCISH_DEF_FLAG_i686-unknown-linux-musl :=
+CFG_LLC_FLAGS_i686-unknown-linux-musl :=
+CFG_INSTALL_NAME_i686-unknown-linux-musl =
+CFG_EXE_SUFFIX_i686-unknown-linux-musl =
+CFG_WINDOWSY_i686-unknown-linux-musl :=
+CFG_UNIXY_i686-unknown-linux-musl := 1
+CFG_LDPATH_i686-unknown-linux-musl :=
+CFG_RUN_i686-unknown-linux-musl=$(2)
+CFG_RUN_TARG_i686-unknown-linux-musl=$(call CFG_RUN_i686-unknown-linux-musl,,$(2))
+CFG_GNU_TRIPLE_i686-unknown-linux-musl := i686-unknown-linux-musl
+CFG_THIRD_PARTY_OBJECTS_i686-unknown-linux-musl := crt1.o crti.o crtn.o
+CFG_INSTALLED_OBJECTS_i686-unknown-linux-musl := crt1.o crti.o crtn.o
+
+NATIVE_DEPS_libc_T_i686-unknown-linux-musl += libc.a
+NATIVE_DEPS_std_T_i686-unknown-linux-musl += libunwind.a crt1.o crti.o crtn.o

branches/stable/mk/crates.mk

@@ -106,7 +106,7 @@ DEPS_rustc_passes := syntax rustc core rustc_front
 DEPS_rustc_mir := rustc rustc_front syntax
 DEPS_rustc_resolve := arena rustc rustc_front log syntax
 DEPS_rustc_platform_intrinsics := rustc rustc_llvm
-DEPS_rustc_plugin := rustc rustc_metadata syntax
+DEPS_rustc_plugin := rustc rustc_metadata syntax rustc_mir
 DEPS_rustc_privacy := rustc rustc_front log syntax
 DEPS_rustc_trans := arena flate getopts graphviz libc rustc rustc_back rustc_mir \
                     log syntax serialize rustc_llvm rustc_front rustc_platform_intrinsics

branches/stable/mk/main.mk

@@ -361,6 +361,9 @@ export CFG_DISABLE_UNSTABLE_FEATURES
 export RUSTC_BOOTSTRAP_KEY:=$(CFG_BOOTSTRAP_KEY)
 endif
 export CFG_BOOTSTRAP_KEY
+ifdef CFG_MUSL_ROOT
+export CFG_MUSL_ROOT
+endif
 
 ######################################################################
 # Per-stage targets and runner

branches/stable/mk/rt.mk

@@ -254,6 +254,15 @@ ifeq ($$(findstring freebsd,$(1)),freebsd)
 	COMPRT_CFLAGS_$(1) += -I/usr/include/c++/v1
 endif
 
+ifeq ($$(findstring emscripten,$(1)),emscripten)
+
+# FIXME: emscripten doesn't use compiler-rt and can't build it without
+# further hacks
+$$(COMPRT_LIB_$(1)):
+	touch $$@
+
+else
+
 $$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS)
 	@$$(call E, make: compiler-rt)
 	$$(Q)$$(MAKE) -C "$(S)src/compiler-rt" \
@@ -266,7 +275,10 @@ $$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS)
 		TargetTriple=$(1) \
 		triple-builtins
 	$$(Q)cp $$(COMPRT_BUILD_DIR_$(1))/triple/builtins/libcompiler_rt.a $$@
+
+endif # if emscripten
 endif
+
 ################################################################################
 # libbacktrace
 #
@@ -301,6 +313,12 @@ $$(BACKTRACE_LIB_$(1)):
 	touch $$@
 else
 
+ifeq ($$(findstring emscripten,$(1)),emscripten)
+# FIXME: libbacktrace doesn't understand the emscripten triple
+$$(BACKTRACE_LIB_$(1)):
+	touch $$@
+else
+
 ifdef CFG_ENABLE_FAST_MAKE
 BACKTRACE_DEPS := $(S)/.gitmodules
 else
@@ -348,6 +366,7 @@ $$(BACKTRACE_LIB_$(1)): $$(BACKTRACE_BUILD_DIR_$(1))/Makefile $$(MKFILE_DEPS)
 		INCDIR=$(S)src/libbacktrace
 	$$(Q)cp $$(BACKTRACE_BUILD_DIR_$(1))/.libs/libbacktrace.a $$@
 
+endif # endif for emscripten
 endif # endif for msvc
 endif # endif for ios
 endif # endif for darwin

branches/stable/src/compiletest/runtest.rs

@@ -1357,7 +1357,12 @@ fn make_lib_name(config: &Config, auxfile: &Path, testfile: &Path) -> PathBuf {
 
 fn make_exe_name(config: &Config, testfile: &Path) -> PathBuf {
     let mut f = output_base_name(config, testfile);
-    if !env::consts::EXE_SUFFIX.is_empty() {
+    // FIXME: This is using the host architecture exe suffix, not target!
+    if config.target == "asmjs-unknown-emscripten" {
+        let mut fname = f.file_name().unwrap().to_os_string();
+        fname.push(".js");
+        f.set_file_name(&fname);
+    } else if !env::consts::EXE_SUFFIX.is_empty() {
         let mut fname = f.file_name().unwrap().to_os_string();
         fname.push(env::consts::EXE_SUFFIX);
         f.set_file_name(&fname);
@@ -1370,6 +1375,12 @@ fn make_run_args(config: &Config, props: &TestProps, testfile: &Path)
     // If we've got another tool to run under (valgrind),
     // then split apart its command
     let mut args = split_maybe_args(&config.runtool);
+
+    // If this is emscripten, then run tests under nodejs
+    if config.target == "asmjs-unknown-emscripten" {
+        args.push("nodejs".to_owned());
+    }
+
     let exe_file = make_exe_name(config, testfile);
 
     // FIXME (#9639): This needs to handle non-utf8 paths

branches/stable/src/compiletest/util.rs

@@ -26,6 +26,7 @@ const OS_TABLE: &'static [(&'static str, &'static str)] = &[
     ("win32", "windows"),
     ("windows", "windows"),
     ("solaris", "solaris"),
+    ("emscripten", "emscripten"),
 ];
 
 const ARCH_TABLE: &'static [(&'static str, &'static str)] = &[
@@ -44,6 +45,7 @@ const ARCH_TABLE: &'static [(&'static str, &'static str)] = &[
     ("sparc", "sparc"),
     ("x86_64", "x86_64"),
     ("xcore", "xcore"),
+    ("asmjs", "asmjs"),
 ];
 
 pub fn get_os(triple: &str) -> &'static str {