Skip to content

src/rt/arch/i386/morestack.S: call rust_stack_exhausted via plt #26321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 1 commit into from
Jun 17, 2015
Merged

src/rt/arch/i386/morestack.S: call rust_stack_exhausted via plt #26321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/rt/arch/i386/morestack.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,14 @@
#else
#if defined(__linux__) || defined(__FreeBSD__)
#define MORESTACK __morestack
#define EXHAUSTED rust_stack_exhausted
#define EXHAUSTED rust_stack_exhausted@plt
#else
#define MORESTACK ___morestack
#define EXHAUSTED _rust_stack_exhausted
#endif
#endif

.globl MORESTACK
.globl EXHAUSTED

// FIXME: What about __WIN32__?
#if defined(__linux__) || defined(__FreeBSD__)
Expand Down Expand Up @@ -138,7 +137,7 @@ MORESTACK:

// re-align the stack
subl $12,%esp
calll EXHAUSTED
call EXHAUSTED
// the exhaustion function guarantees that it can't return

.cfi_endproc