---

brson · brson · commit 02cd9ba34d3d · 2011-11-22T18:02:13.000-08:00
yaml --- r: 6446 b: refs/heads/master c: 93e8783 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0580d4e77a8187015b891aa91ab890e764688b63
+refs/heads/master: 93e8783496008b27347b4b68e60e938b34b3ea6a
diff --git a/trunk/src/rt/arch/i386/morestack.S b/trunk/src/rt/arch/i386/morestack.S
@@ -29,13 +29,18 @@
 #define ALIGNMENT               8
 #endif
 
-#if defined (__APPLE__) || defined(_WIN32)
+#if defined (__APPLE__)
 #define NEW_STACK_ADDR          rust_new_stack_sym-.L$pic_ref_pt_0(%eax)
 #define DEL_STACK_ADDR          rust_del_stack_sym-.L$pic_ref_pt_1(%edx)
 #else
+#if defined (_WIN32)
+#define NEW_STACK_ADDR          $_rust_new_stack
+#define DEL_STACK_ADDR          $_rust_del_stack
+#else
 #define NEW_STACK_ADDR          $rust_new_stack
 #define DEL_STACK_ADDR          $rust_del_stack
 #endif
+#endif
 
 #define RETURN_OFFSET   7
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 0580d4e77a8187015b891aa91ab890e764688b63`
	`2`	`+refs/heads/master: 93e8783496008b27347b4b68e60e938b34b3ea6a`