about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAkos Kiss <akiss@inf.u-szeged.hu>2015-07-13 20:06:04 +0200
committerAkos Kiss <akiss@inf.u-szeged.hu>2015-07-13 21:13:52 +0200
commiteaee43aeba955e9f6ddb708a01b8e31ce536aece (patch)
treee91ee635d5724f5692a6c827c23fff810ffc5a7d
parent0fbcebaaec518a0a39f0b835cd52e9edfaba9cc2 (diff)
downloadrust-eaee43aeba955e9f6ddb708a01b8e31ce536aece.tar.gz
rust-eaee43aeba955e9f6ddb708a01b8e31ce536aece.zip
Fix section of __morestack for aarch64-unknown-linux-gnu
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).
-rw-r--r--src/rt/arch/aarch64/morestack.S6
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