diff options
| author | Brian Anderson <banderson@mozilla.com> | 2011-11-29 13:15:48 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2011-11-29 13:47:54 -0800 |
| commit | 9675343dc975a0159d5f7b52e4a7f72737f0549c (patch) | |
| tree | 155c6f7aa09519fda7e3b642c604a0b0606f5773 /src | |
| parent | 5ce33ceb7665c7a3366f05a50360d78bc4f65a66 (diff) | |
rt: Fix i386/morestack.S for static linking
Diffstat (limited to 'src')
| -rw-r--r-- | src/rt/arch/i386/morestack.S | 3 | ||||
| -rw-r--r-- | src/rt/rust_internal.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/rt/arch/i386/morestack.S b/src/rt/arch/i386/morestack.S index b14b1ac8bdb..1b2536debeb 100644 --- a/src/rt/arch/i386/morestack.S +++ b/src/rt/arch/i386/morestack.S @@ -94,7 +94,8 @@ MORESTACK: movl NEW_STACK_ADDR,%eax movl %eax,(%esp) movl %edx,4(%esp) - calll UPCALL_CALL_C_STACK + // FIXME: Don't understand why just _here_ I have to say @PLT + calll UPCALL_CALL_C_STACK@PLT movl 12(%esp),%edx // Grab the return pointer. addl $RETURN_OFFSET,%edx // Skip past the `add esp,4` and the `ret`. diff --git a/src/rt/rust_internal.h b/src/rt/rust_internal.h index b6224893520..4eec576379a 100644 --- a/src/rt/rust_internal.h +++ b/src/rt/rust_internal.h @@ -96,7 +96,7 @@ static size_t const BUF_BYTES = 2048; // FIXME: We want this to be 128 but need to slim the red zone calls down #ifdef __i386__ -#define RED_ZONE_SIZE 256 +#define RED_ZONE_SIZE 2048 #endif #ifdef __x86_64__ |