---

bors · bors · commit 025465578c2d · 2013-07-12T09:40:36.000-07:00
yaml --- r: 64271 b: refs/heads/snap-stage3 c: 4e1292a h: refs/heads/master i: 64269: 5f91017 64267: eae1785 64263: 629e828 64255: 1bdb44a v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 96b3163c835eb3821e23deefb57c86d80324a54a
+refs/heads/snap-stage3: 4e1292ad6bb48010a224e0c43d13e628359fe003
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/rt/rust_env.cpp b/branches/snap-stage3/src/rt/rust_env.cpp
@@ -27,6 +27,9 @@
 #define RUST_DEBUG_MEM "RUST_DEBUG_MEM"
 #define RUST_DEBUG_BORROW "RUST_DEBUG_BORROW"
 
+#define DEFAULT_RUST_MIN_STACK_32 0x300
+#define DEFAULT_RUST_MIN_STACK_64 0x400000
+
 static lock_and_signal env_lock;
 
 extern "C" CDECL void
@@ -99,8 +102,10 @@ get_min_stk_size() {
     if(minsz) {
         return strtol(minsz, NULL, 0);
     }
-    else {
-        return 0x300;
+    else if (sizeof(size_t) > 4) {
+        return DEFAULT_RUST_MIN_STACK_64;
+    } else {
+        return DEFAULT_RUST_MIN_STACK_32;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,9 @@`
`27`	`27`	`#define RUST_DEBUG_MEM "RUST_DEBUG_MEM"`
`28`	`28`	`#define RUST_DEBUG_BORROW "RUST_DEBUG_BORROW"`
`29`	`29`
	`30`	`+#define DEFAULT_RUST_MIN_STACK_32 0x300`
	`31`	`+#define DEFAULT_RUST_MIN_STACK_64 0x400000`
	`32`	`+`
`30`	`33`	`static lock_and_signal env_lock;`
`31`	`34`
`32`	`35`	`extern "C" CDECL void`
`@@ -99,8 +102,10 @@ get_min_stk_size() {`
`99`	`102`	`if(minsz) {`
`100`	`103`	`return strtol(minsz, NULL, 0);`
`101`	`104`	`}`
`102`		`- else {`
`103`		`- return 0x300;`
	`105`	`+ else if (sizeof(size_t) > 4) {`
	`106`	`+ return DEFAULT_RUST_MIN_STACK_64;`
	`107`	`+ } else {`
	`108`	`+ return DEFAULT_RUST_MIN_STACK_32;`
`104`	`109`	`}`
`105`	`110`	`}`
`106`	`111`