Skip to content

Commit 9675343

Browse files
committed
rt: Fix i386/morestack.S for static linking
1 parent 5ce33ce commit 9675343

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/rt/arch/i386/morestack.S

+2-1
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`.

src/rt/rust_internal.h

+1-1
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)