diff options
| author | bors <bors@rust-lang.org> | 2015-01-12 00:21:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-12 00:21:27 +0000 |
| commit | 79602e24c85a16a0eae42e1ec5dd59446b79ddab (patch) | |
| tree | 2bc785b61bd7e92360b9876cba9c3dfdf4c40a40 /src | |
| parent | a9679c643bfb7fcff4ce2c307ea80be452e1ee4e (diff) | |
| parent | 6c9bdf2a11268325485478fbe3b1565c61098b05 (diff) | |
| download | rust-79602e24c85a16a0eae42e1ec5dd59446b79ddab.tar.gz rust-79602e24c85a16a0eae42e1ec5dd59446b79ddab.zip | |
Merge pull request #20905 from akiss77/pr-morestack-plt
Fix: GNU AArch64 assembler does not like @plt symbol suffix Reviewed-by: alexcrichton
Diffstat (limited to 'src')
| -rw-r--r-- | src/rt/arch/aarch64/morestack.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rt/arch/aarch64/morestack.S b/src/rt/arch/aarch64/morestack.S index 772b8467014..c5e412140e4 100644 --- a/src/rt/arch/aarch64/morestack.S +++ b/src/rt/arch/aarch64/morestack.S @@ -9,7 +9,7 @@ #if defined(__APPLE__) #define MORESTACK ___morestack -#define STACK_EXHAUSTED _rust_stack_exhausted +#define STACK_EXHAUSTED _rust_stack_exhausted@plt #else #define MORESTACK __morestack #define STACK_EXHAUSTED rust_stack_exhausted @@ -30,6 +30,6 @@ // FIXME(AARCH64): this might not be perfectly right but works for now MORESTACK: .cfi_startproc - bl STACK_EXHAUSTED@plt + bl STACK_EXHAUSTED // the above function ensures that it never returns .cfi_endproc |