---

yaml
---
r: 92407
b: refs/heads/auto
c: 4c79b22
h: refs/heads/master
i:
  92405: 3c54b5f
  92403: c9fe02c
  92399: e530950
v: v3

Author: huonw

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b6933f8d8b86f78ac7b5f70f0781d794144763a0
+refs/heads/auto: 4c79b22ef26a2b846d84c46bc8fea50c953559dd
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/configure

@@ -910,11 +910,9 @@ do
         # Try to have LLVM pull in as few dependencies as possible (#9397)
         LLVM_OPTS="$LLVM_OPTS --disable-zlib --disable-libffi"
 
-        # Use win32 native thread/lock apis instead of pthread wrapper.
-        # (llvm's configure tries to find pthread first, so we have to disable it explicitly.)
-        # Also note that pthreads works badly on mingw-w64 systems: #8996
+        # pthreads works badly on mingw-w64 systems: #8996
         case "$CFG_BUILD" in
-            (*-mingw32)
+            (*w64-mingw32)
             LLVM_OPTS="$LLVM_OPTS --disable-pthreads"
             ;;
         esac

branches/auto/mk/llvm.mk

@@ -51,7 +51,8 @@ $(S)src/librustc/lib/llvmdeps.rs: \
 		    $(LLVM_CONFIGS) \
 		    $(S)src/etc/mklldeps.py
 	$(Q)$(CFG_PYTHON) $(S)src/etc/mklldeps.py \
-	    "$@" "$(LLVM_COMPONENTS)" $(LLVM_CONFIGS)
+	    "$(LLVM_COMPONENTS)" $(LLVM_CONFIGS) \
+	    > $@
 
 $(foreach host,$(CFG_HOST), \
  $(eval $(call DEF_LLVM_RULES,$(host))))

branches/auto/mk/tests.mk

@@ -920,15 +920,14 @@ $$(call TEST_OK_FILE,$(1),$(2),$(3),rmake): \
 
 $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
 		$(S)src/test/run-make/%/Makefile \
-		$$(CSREQ$(1)_T_$(2)_H_$(3))
+		$$(HSREQ$(1)_H_$(3))
 	@rm -rf $(3)/test/run-make/$$*
 	@mkdir -p $(3)/test/run-make/$$*
 	@echo maketest: $$*
 	$$(Q)$$(CFG_PYTHON) $(S)src/etc/maketest.py $$(dir $$<) \
 	    $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
 	    $(3)/test/run-make/$$* \
-	    "$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \
-	    $$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3))
+	    "$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))"
 	@touch $$@
 
 endef

branches/auto/src/etc/maketest.py

@@ -7,7 +7,6 @@
 os.putenv('RUSTC', os.path.abspath(sys.argv[2]))
 os.putenv('TMPDIR', os.path.abspath(sys.argv[3]))
 os.putenv('CC', sys.argv[4])
-os.putenv('RUSTDOC', os.path.abspath(sys.argv[5]))
 
 proc = subprocess.Popen(['make', '-C', sys.argv[1]],
                         stdout = subprocess.PIPE,

branches/auto/src/etc/mklldeps.py

@@ -4,11 +4,9 @@
 import sys
 import subprocess
 
-f = open(sys.argv[1], 'wb')
+components = sys.argv[1].split(' ')
 
-components = sys.argv[2].split(' ')
-
-f.write("""// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+print """// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -20,10 +18,10 @@
 
 // WARNING: THIS IS A GENERATED FILE, DO NOT MODIFY
 //          take a look at src/etc/mklldeps.py if you're interested
-""")
+"""
 
-for llconfig in sys.argv[3:]:
-    f.write("\n")
+for llconfig in sys.argv[2:]:
+    print
 
     proc = subprocess.Popen([llconfig, '--host-target'], stdout = subprocess.PIPE)
     out, err = proc.communicate()
@@ -44,7 +42,7 @@
         "target_os = \"" + os + "\"",
     ]
 
-    f.write("#[cfg(" + ', '.join(cfg) + ")]\n")
+    print "#[cfg(" + ', '.join(cfg) + ")]"
 
     args = [llconfig, '--libs']
     args.extend(components)
@@ -53,7 +51,8 @@
 
     for lib in out.strip().split(' '):
         lib = lib[2:] # chop of the leading '-l'
-        f.write("#[link(name = \"" + lib + "\", kind = \"static\")]\n")
+        print "#[link(name = \"" + lib + "\", kind = \"static\")]"
     if os == 'win32':
-        f.write("#[link(name = \"imagehlp\")]\n")
-    f.write("extern {}\n")
+        print "#[link(name = \"pthread\")]"
+        print "#[link(name = \"imagehlp\")]"
+    print "extern {}"

branches/auto/src/etc/snapshot.py

@@ -32,7 +32,8 @@ def scrub(b):
     }
 
 winnt_runtime_deps = ["libgcc_s_dw2-1.dll",
-                      "libstdc++-6.dll"]
+                      "libstdc++-6.dll",
+                      "libpthread-2.dll"]
 
 def parse_line(n, line):
   global snapshotfile