Skip to content

Commit b8a9c80

Browse files
committed
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).
2 parents b64af26 + eaee43a commit b8a9c80

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/rt/arch/aarch64/morestack.S

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#endif
2525

2626
#if !defined(__APPLE__)
27-
.type MORESTACK,%function
27+
func MORESTACK
2828
#endif
2929

3030
// FIXME(AARCH64): this might not be perfectly right but works for now
@@ -33,3 +33,7 @@ MORESTACK:
3333
bl STACK_EXHAUSTED
3434
// the above function ensures that it never returns
3535
.cfi_endproc
36+
37+
#if !defined(__APPLE__)
38+
endfunc MORESTACK
39+
#endif

0 commit comments

Comments
 (0)