diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-07-16 14:14:34 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-07-16 16:37:40 +0530 |
| commit | b8a9c801662fbddb833ff30aae578fcf6659bf77 (patch) | |
| tree | e1eabcbb856acbb0260268b87f3870c6de8996fe /src | |
| parent | b64af26625a699ae49403202f41cf2c0dfc449ff (diff) | |
| parent | eaee43aeba955e9f6ddb708a01b8e31ce536aece (diff) | |
| download | rust-b8a9c801662fbddb833ff30aae578fcf6659bf77.tar.gz rust-b8a9c801662fbddb833ff30aae578fcf6659bf77.zip | |
Rollup merge of #27019 - akiss77:pr-aarch64-morestack-section, r=alexcrichton
When building for AArch64/Linux, __morestack ends up in the .note.GNU-stack section, which causes missing references for the linker. By using the func/endfunc macros from macros.S we get __morestack right to .text (and a bit more on the side).
Diffstat (limited to 'src')
| -rw-r--r-- | src/rt/arch/aarch64/morestack.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rt/arch/aarch64/morestack.S b/src/rt/arch/aarch64/morestack.S index c5e412140e4..8b7366ebed4 100644 --- a/src/rt/arch/aarch64/morestack.S +++ b/src/rt/arch/aarch64/morestack.S @@ -24,7 +24,7 @@ #endif #if !defined(__APPLE__) -.type MORESTACK,%function +func MORESTACK #endif // FIXME(AARCH64): this might not be perfectly right but works for now @@ -33,3 +33,7 @@ MORESTACK: bl STACK_EXHAUSTED // the above function ensures that it never returns .cfi_endproc + +#if !defined(__APPLE__) +endfunc MORESTACK +#endif |