summaryrefslogtreecommitdiff
path: root/src/setjmp
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-06-14 23:15:08 -0400
committerRich Felker <dalias@aerifal.cx>2011-06-14 23:15:08 -0400
commitc7d19f9923c66a2ddb47272f1e8fec8b804f54c4 (patch)
treeb5eee6681995cd3f661ccfc36fc044ae0330e69f /src/setjmp
parent836ba93d93f901d25e8ed4ac34209cf547d8e217 (diff)
downloadmusl-c7d19f9923c66a2ddb47272f1e8fec8b804f54c4.tar.gz
musl-c7d19f9923c66a2ddb47272f1e8fec8b804f54c4.tar.bz2
musl-c7d19f9923c66a2ddb47272f1e8fec8b804f54c4.tar.xz
musl-c7d19f9923c66a2ddb47272f1e8fec8b804f54c4.zip
restore use of .type in asm, but use modern @function (vs %function)
this seems to be necessary to make the linker accept the functions in a shared library (perhaps to generate PLT entries?) strictly speaking libc-internal asm should not need it. i might clean that up later.
Diffstat (limited to 'src/setjmp')
-rw-r--r--src/setjmp/i386/longjmp.s2
-rw-r--r--src/setjmp/i386/setjmp.s3
-rw-r--r--src/setjmp/x86_64/longjmp.s2
-rw-r--r--src/setjmp/x86_64/setjmp.s3
4 files changed, 10 insertions, 0 deletions
diff --git a/src/setjmp/i386/longjmp.s b/src/setjmp/i386/longjmp.s
index b139d9fe..772d28dd 100644
--- a/src/setjmp/i386/longjmp.s
+++ b/src/setjmp/i386/longjmp.s
@@ -1,5 +1,7 @@
.global _longjmp
.global longjmp
+.type _longjmp,@function
+.type longjmp,@function
_longjmp:
longjmp:
mov 4(%esp),%edx
diff --git a/src/setjmp/i386/setjmp.s b/src/setjmp/i386/setjmp.s
index d53c1a63..586d4390 100644
--- a/src/setjmp/i386/setjmp.s
+++ b/src/setjmp/i386/setjmp.s
@@ -1,6 +1,9 @@
.global __setjmp
.global _setjmp
.global setjmp
+.type __setjmp,@function
+.type _setjmp,@function
+.type setjmp,@function
__setjmp:
_setjmp:
setjmp:
diff --git a/src/setjmp/x86_64/longjmp.s b/src/setjmp/x86_64/longjmp.s
index 70271bf5..444076f1 100644
--- a/src/setjmp/x86_64/longjmp.s
+++ b/src/setjmp/x86_64/longjmp.s
@@ -1,6 +1,8 @@
/* Copyright 2011 Nicholas J. Kain, licensed GNU LGPL 2.1 or later */
.global _longjmp
.global longjmp
+.type _longjmp,@function
+.type longjmp,@function
_longjmp:
longjmp:
mov %rsi,%rax /* val will be longjmp return */
diff --git a/src/setjmp/x86_64/setjmp.s b/src/setjmp/x86_64/setjmp.s
index d5ff113a..5b3173b9 100644
--- a/src/setjmp/x86_64/setjmp.s
+++ b/src/setjmp/x86_64/setjmp.s
@@ -2,6 +2,9 @@
.global __setjmp
.global _setjmp
.global setjmp
+.type __setjmp,@function
+.type _setjmp,@function
+.type setjmp,@function
__setjmp:
_setjmp:
setjmp: