summaryrefslogtreecommitdiff
path: root/crt/arm
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-08-15 14:52:27 -0400
committerRich Felker <dalias@aerifal.cx>2013-08-15 14:52:27 -0400
commitbadaa04accd6e606c5a5c448c579e4b18b6c1012 (patch)
tree6c73893362ab6a20f1ee246b743fe4e2ac68a5dc /crt/arm
parentc221af951693d526d3ae946f7e708af8e7a9bf85 (diff)
downloadmusl-badaa04accd6e606c5a5c448c579e4b18b6c1012.tar.gz
musl-badaa04accd6e606c5a5c448c579e4b18b6c1012.tar.bz2
musl-badaa04accd6e606c5a5c448c579e4b18b6c1012.tar.xz
musl-badaa04accd6e606c5a5c448c579e4b18b6c1012.zip
add function types to arm crt assembly
without these, calls may be resolved incorrectly if the calling code has been compiled to thumb instead of arm. it's not clear to me at this point whether crt_arch.h is even working if crt1.c is built as thumb; this needs testing. but the _init and _fini issues were known to cause crashes in static-linked apps when libc was built as thumb, and this commit should fix that issue.
Diffstat (limited to 'crt/arm')
-rw-r--r--crt/arm/crt1.s1
-rw-r--r--crt/arm/crti.s2
2 files changed, 3 insertions, 0 deletions
diff --git a/crt/arm/crt1.s b/crt/arm/crt1.s
index ed2a57a2..90ef59f3 100644
--- a/crt/arm/crt1.s
+++ b/crt/arm/crt1.s
@@ -1,6 +1,7 @@
.weak _init
.weak _fini
.global _start
+.type _start,%function
_start:
mov fp,#0
mov lr,#0
diff --git a/crt/arm/crti.s b/crt/arm/crti.s
index 0d479cd2..1ba165c5 100644
--- a/crt/arm/crti.s
+++ b/crt/arm/crti.s
@@ -1,9 +1,11 @@
.section .init
.global _init
+.type _init,%function
_init:
push {r0,lr}
.section .fini
.global _fini
+.type _fini,%function
_fini:
push {r0,lr}