Skip to content

Commit 49a2d8a

Browse files
committed
---
yaml --- r: 6508 b: refs/heads/master c: 9675343 h: refs/heads/master v: v3
1 parent 8c241e4 commit 49a2d8a

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 5ce33ceb7665c7a3366f05a50360d78bc4f65a66
2+
refs/heads/master: 9675343dc975a0159d5f7b52e4a7f72737f0549c

trunk/src/rt/arch/i386/morestack.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ MORESTACK:
9494
movl NEW_STACK_ADDR,%eax
9595
movl %eax,(%esp)
9696
movl %edx,4(%esp)
97-
calll UPCALL_CALL_C_STACK
97+
// FIXME: Don't understand why just _here_ I have to say @PLT
98+
calll UPCALL_CALL_C_STACK@PLT
9899

99100
movl 12(%esp),%edx // Grab the return pointer.
100101
addl $RETURN_OFFSET,%edx // Skip past the `add esp,4` and the `ret`.

trunk/src/rt/rust_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static size_t const BUF_BYTES = 2048;
9696

9797
// FIXME: We want this to be 128 but need to slim the red zone calls down
9898
#ifdef __i386__
99-
#define RED_ZONE_SIZE 256
99+
#define RED_ZONE_SIZE 2048
100100
#endif
101101

102102
#ifdef __x86_64__

0 commit comments

Comments
 (0)