---

yaml
---
r: 149949
b: refs/heads/try2
c: 4443fb3
h: refs/heads/master
i:
  149947: 0764be9
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a63deeb3d32fc21f36d484d62a3ea1d3d0c82500
+refs/heads/try2: 4443fb3cfa945cf7cb791cf8f2ec81b7faf25132
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/mk/crates.mk

@@ -55,7 +55,7 @@ HOST_CRATES := syntax rustc rustdoc fourcc hexfloat
 CRATES := $(TARGET_CRATES) $(HOST_CRATES)
 TOOLS := compiletest rustdoc rustc
 
-DEPS_std := native:rustrt native:compiler-rt
+DEPS_std := native:rustrt native:compiler-rt native:backtrace
 DEPS_extra := std term sync serialize getopts collections time rand
 DEPS_green := std rand native:context_switch
 DEPS_rustuv := std native:uv native:uv_support

branches/try2/mk/docs.mk

@@ -147,6 +147,10 @@ SHOULD_BUILD_PDF_DOC_$(1) = 1
 endef
 $(foreach docname,$(PDF_DOCS),$(eval $(call DEF_SHOULD_BUILD_PDF_DOC,$(docname))))
 
+doc/footer.tex: $(D)/footer.inc | doc/
+	@$(call E, pandoc: $@)
+	$(CFG_PANDOC) --from=html --to=latex $< --output=$@
+
 define DEF_DOC
 
 # HTML (rustdoc)
@@ -163,10 +167,6 @@ doc/$(1).epub: $$(D)/$(1).md | doc/
 	@$$(call E, pandoc: $$@)
 	$$(CFG_PANDOC) $$(PANDOC_EPUB_OPTS) $$< --output=$$@
 
-doc/footer.tex: $(D)/footer.inc | doc/
-	@$$(call E, pandoc: $$@)
-	$$(CFG_PANDOC) --from=html --to=latex $$< --output=$$@
-
 # PDF (md =(pandoc)=> tex =(pdflatex)=> pdf)
 DOC_TARGETS += doc/$(1).tex
 doc/$(1).tex: $$(D)/$(1).md doc/footer.tex doc/version.tex | doc/

branches/try2/mk/platform.mk

@@ -330,7 +330,7 @@ CFG_PATH_MUNGE_arm-unknown-linux-gnueabihf := true
 CFG_LDPATH_arm-unknown-linux-gnueabihf :=
 CFG_RUN_arm-unknown-linux-gnueabihf=$(2)
 CFG_RUN_TARG_arm-unknown-linux-gnueabihf=$(call CFG_RUN_arm-unknown-linux-gnueabihf,,$(2))
-RUSTC_FLAGS_arm-unknown-linux-gnueabihf :=
+RUSTC_FLAGS_arm-unknown-linux-gnueabihf := -C target-feature=+v7,+vfp3
 RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf :=
 
 # arm-unknown-linux-gnueabi configuration

branches/try2/mk/rt.mk

@@ -249,6 +249,73 @@ $$(COMPRT_LIB_$(1)): $$(COMPRT_DEPS) $$(MKFILE_DEPS)
 		triple-runtime
 	$$(Q)cp $$(COMPRT_BUILD_DIR_$(1))/triple/runtime/libcompiler_rt.a $$(COMPRT_LIB_$(1))
 
+################################################################################
+# libbacktrace
+#
+# We use libbacktrace on linux to get symbols in backtraces, but only on linux.
+# Elsewhere we use other system utilities, so this library is only built on
+# linux.
+################################################################################
+
+BACKTRACE_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),backtrace)
+BACKTRACE_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/$$(BACKTRACE_NAME_$(1))
+BACKTRACE_BUILD_DIR_$(1) := $$(RT_OUTPUT_DIR_$(1))/libbacktrace
+
+ifeq ($$(findstring darwin,$$(OSTYPE_$(1))),darwin)
+
+# We don't use this on platforms that aren't linux-based, so just make the file
+# available, the compilation of libstd won't actually build it.
+$$(BACKTRACE_LIB_$(1)):
+	touch $$@
+
+else
+ifeq ($$(CFG_WINDOWSY_$(1)),1)
+$$(BACKTRACE_LIB_$(1)):
+	touch $$@
+else
+
+ifdef CFG_ENABLE_FAST_MAKE
+BACKTRACE_DEPS := $(S)/.gitmodules
+else
+BACKTRACE_DEPS := $(wildcard $(S)src/libbacktrace/*)
+endif
+
+# We need to export CFLAGS because otherwise it doesn't pick up cross compile
+# builds. If libbacktrace doesn't realize this, it will attempt to read 64-bit
+# elf headers when compiled for a 32-bit system, yielding blank backtraces.
+#
+# This also removes the -Werror flag specifically to prevent errors during
+# configuration.
+#
+# Down below you'll also see echos into the config.h generated by the
+# ./configure script. This is done to force libbacktrace to *not* use the
+# atomic/sync functionality because it pulls in unnecessary dependencies and we
+# never use it anyway.
+$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: \
+		export CFLAGS:=$$(CFG_GCCISH_CFLAGS_$(1):-Werror=) \
+				-fno-stack-protector
+$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export CC:=$$(CC_$(1))
+$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export AR:=$$(AR_$(1))
+$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: export RANLIB:=$$(AR_$(1)) s
+$$(BACKTRACE_BUILD_DIR_$(1))/Makefile: $$(BACKTRACE_DEPS) $$(MKFILE_DEPS)
+	$$(Q)rm -rf $$(BACKTRACE_BUILD_DIR_$(1))
+	$$(Q)mkdir -p $$(BACKTRACE_BUILD_DIR_$(1))
+	$$(Q)(cd $$(BACKTRACE_BUILD_DIR_$(1)) && \
+	      $(S)src/libbacktrace/configure --target=$(1) --host=$(CFG_BUILD))
+	$$(Q)echo '#undef HAVE_ATOMIC_FUNCTIONS' >> \
+	      $$(BACKTRACE_BUILD_DIR_$(1))/config.h
+	$$(Q)echo '#undef HAVE_SYNC_FUNCTIONS' >> \
+	      $$(BACKTRACE_BUILD_DIR_$(1))/config.h
+
+$$(BACKTRACE_LIB_$(1)): $$(BACKTRACE_BUILD_DIR_$(1))/Makefile $$(MKFILE_DEPS)
+	@$$(call E, make: libbacktrace)
+	$$(Q)$$(MAKE) -C $$(BACKTRACE_BUILD_DIR_$(1)) \
+		INCDIR=$(S)src/libbacktrace
+	$$(Q)cp $$(BACKTRACE_BUILD_DIR_$(1))/.libs/libbacktrace.a $$@
+
+endif # endif for windowsy
+endif # endif for darwin
+
 endef
 
 # Instantiate template for all stages/targets

branches/try2/mk/tests.mk

@@ -240,6 +240,7 @@ tidy:
 		| grep '^$(S)src/libuv' -v \
 		| grep '^$(S)src/llvm' -v \
 		| grep '^$(S)src/gyp' -v \
+		| grep '^$(S)src/libbacktrace' -v \
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
 		$(Q)find $(S)src/etc -name '*.py' \
 		| xargs -n 10 $(CFG_PYTHON) $(S)src/etc/tidy.py
@@ -266,6 +267,7 @@ tidy:
 		| grep '^$(S)src/etc' -v \
 		| grep '^$(S)src/doc' -v \
 		| grep '^$(S)src/compiler-rt' -v \
+		| grep '^$(S)src/libbacktrace' -v \
 		| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
 
 endif

branches/try2/src/compiletest/compiletest.rs

@@ -191,13 +191,13 @@ pub fn opt_str2(maybestr: Option<~str>) -> ~str {
 }
 
 pub fn str_mode(s: ~str) -> mode {
-    match s {
-      ~"compile-fail" => mode_compile_fail,
-      ~"run-fail" => mode_run_fail,
-      ~"run-pass" => mode_run_pass,
-      ~"pretty" => mode_pretty,
-      ~"debug-info" => mode_debug_info,
-      ~"codegen" => mode_codegen,
+    match s.as_slice() {
+      "compile-fail" => mode_compile_fail,
+      "run-fail" => mode_run_fail,
+      "run-pass" => mode_run_pass,
+      "pretty" => mode_pretty,
+      "debug-info" => mode_debug_info,
+      "codegen" => mode_codegen,
       _ => fail!("invalid mode")
     }
 }

branches/try2/src/compiletest/errors.rs

@@ -19,7 +19,7 @@ pub fn load_errors(testfile: &Path) -> ~[ExpectedError] {
     let mut rdr = BufferedReader::new(File::open(testfile).unwrap());
     let mut line_num = 1u;
     for ln in rdr.lines() {
-        error_patterns.push_all_move(parse_expected(line_num, ln));
+        error_patterns.push_all_move(parse_expected(line_num, ln.unwrap()));
         line_num += 1u;
     }
     return error_patterns;

branches/try2/src/compiletest/header.rs

@@ -140,6 +140,7 @@ fn iter_header(testfile: &Path, it: |&str| -> bool) -> bool {
         // Assume that any directives will be found before the first
         // module or function. This doesn't seem to be an optimization
         // with a warm page cache. Maybe with a cold one.
+        let ln = ln.unwrap();
         if ln.starts_with("fn") || ln.starts_with("mod") {
             return true;
         } else { if !(it(ln.trim())) { return false; } }

branches/try2/src/compiletest/runtest.rs

@@ -38,9 +38,9 @@ use test::MetricMap;
 
 pub fn run(config: config, testfile: ~str) {
 
-    match config.target {
+    match config.target.as_slice() {
 
-        ~"arm-linux-androideabi" => {
+        "arm-linux-androideabi" => {
             if !config.adb_device_status {
                 fail!("android device not available");
             }
@@ -277,8 +277,8 @@ fn run_debuginfo_test(config: &config, props: &TestProps, testfile: &Path) {
     let exe_file = make_exe_name(config, testfile);
 
     let mut proc_args;
-    match config.target {
-        ~"arm-linux-androideabi" => {
+    match config.target.as_slice() {
+        "arm-linux-androideabi" => {
 
             cmds = cmds.replace("run","continue");
 
@@ -682,9 +682,9 @@ fn exec_compiled_test(config: &config, props: &TestProps,
 
     let env = props.exec_env.clone();
 
-    match config.target {
+    match config.target.as_slice() {
 
-        ~"arm-linux-androideabi" => {
+        "arm-linux-androideabi" => {
             _arm_exec_compiled_test(config, props, testfile, env)
         }
 
@@ -735,9 +735,9 @@ fn compose_and_run_compiler(
                 &auxres);
         }
 
-        match config.target {
+        match config.target.as_slice() {
 
-            ~"arm-linux-androideabi" => {
+            "arm-linux-androideabi" => {
                 _arm_push_aux_shared_library(config, testfile);
             }