---

yaml
---
r: 13455
b: refs/heads/master
c: f8afe10
h: refs/heads/master
i:
  13453: 8e2f67e
  13451: dca3297
  13447: c99f827
  13439: accb9a9
v: v3

Author: msullivan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e5a5fc20290e70752af73860b1a192b33588624f
+refs/heads/master: f8afe107fa7a677dc611dd39532570ddaab3bfab
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/mk/rt.mk

@@ -142,9 +142,10 @@ rt/$(1)/$(CFG_RUNTIME): $$(RUNTIME_OBJS_$(1)) $$(MKFILE_DEPS) \
 	  $$(CFG_GCCISH_POST_LIB_FLAGS) $$(RUNTIME_LIBS_$(1)) \
 	  $$(CFG_LIBUV_LINK_FLAGS),$$(RUNTIME_DEF_$(1)),$$(CFG_RUNTIME))
 
-# FIXME: For some reason libuv's makefiles can't figure out the correct definition
-# of CC on the mingw I'm using, so we are explicitly using gcc. Also, we
-# have to list environment variables first on windows... mysterious
+# FIXME: For some reason libuv's makefiles can't figure out the
+# correct definition of CC on the mingw I'm using, so we are
+# explicitly using gcc. Also, we have to list environment variables
+# first on windows... mysterious
 
 ifdef CFG_ENABLE_FAST_MAKE
 LIBUV_DEPS := $$(S)/.gitmodules

trunk/mk/rustllvm.mk

@@ -14,11 +14,6 @@ endif
 
 RUSTLLVM_OBJS_CS_$(1) := $$(addprefix rustllvm/, RustWrapper.cpp)
 
-# Behind an ifdef for now since this requires a patched LLVM.
-ifdef CFG_STACK_GROWTH
-RUSTLLVM_OBJS_CS_$(1) += rustllvm/RustPrologHook.cpp
-endif
-
 RUSTLLVM_DEF_$(1) := rustllvm/rustllvm$$(CFG_DEF_SUFFIX)
 
 RUSTLLVM_INCS_$(1) = $$(LLVM_EXTRA_INCDIRS_$(1)) \