---

yaml
---
r: 137715
b: refs/heads/auto
c: bc3831b
h: refs/heads/master
i:
  137713: 4ab0fe4
  137711: af07965
v: v3

Author: Keegan McAllister

[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: 441796831f9d57dbb336805b7ddee5097c407d58
+refs/heads/auto: bc3831b7303b10781327d270dca2524cefdbff3d
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/test/run-make/no-stack-check/Makefile

@@ -1,9 +1,15 @@
 -include ../tools.mk
 
+ifndef IS_WINDOWS
 all:
 	$(RUSTC) -O --emit asm attr.rs
 	! grep -q morestack $(TMPDIR)/attr.s
 	$(RUSTC) -O --emit asm flag.rs
 	grep -q morestack $(TMPDIR)/flag.s
 	$(RUSTC) -O --emit asm -C no-stack-check flag.rs
 	! grep -q morestack $(TMPDIR)/flag.s
+else
+# On Windows we use __chkstk and it only appears in functions with large allocations,
+# so this test wouldn't be reliable.
+all:
+endif