aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-12-30 08:43:20 +0000
committerMike Frysinger <vapier@gentoo.org>2013-12-30 05:35:39 -0500
commitd97ae285e8c82cc07b719283e8a3dc799c1b9587 (patch)
tree4504beab34d583647c3c1d35d3de64bfad6e907a
parent88dd1da188f37a9132230967883ba38c645c6dd9 (diff)
downloadglibc-d97ae285e8c82cc07b719283e8a3dc799c1b9587.tar
glibc-d97ae285e8c82cc07b719283e8a3dc799c1b9587.tar.gz
glibc-d97ae285e8c82cc07b719283e8a3dc799c1b9587.tar.bz2
glibc-d97ae285e8c82cc07b719283e8a3dc799c1b9587.zip
ia64: setjmp: use HIDDEN_JUMPTARGET
Rather than opencode the __GI_xxx logic, use proper hidden helpers. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--ports/ChangeLog.ia648
-rw-r--r--ports/sysdeps/unix/sysv/linux/ia64/setjmp.S7
2 files changed, 12 insertions, 3 deletions
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index 8e9b24dd42..b5c426ecb3 100644
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -1,3 +1,11 @@
+2013-12-30 Mike Frysinger <vapier@gentoo.org>
+
+ * sysdeps/unix/sysv/linux/ia64/setjmp.S (setjmp): Call __sigsetjmp
+ via HIDDEN_JUMPTARGET.
+ (_setjmp): Likewise.
+ (__sigsetjmp): Delete strong_alias. Call libc_hidden_def and
+ rtld_hidden_def.
+
2013-12-29 Mike Frysinger <vapier@gentoo.org>
* sysdeps/unix/sysv/linux/ia64/syscall.S: Add a comment.
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/setjmp.S b/ports/sysdeps/unix/sysv/linux/ia64/setjmp.S
index a8d06cc779..bf1b980f4e 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/setjmp.S
+++ b/ports/sysdeps/unix/sysv/linux/ia64/setjmp.S
@@ -71,13 +71,13 @@
LEAF(setjmp)
alloc r8=ar.pfs,2,0,0,0
mov in1=1
- br.cond.sptk.many _GI___sigsetjmp
+ br.cond.sptk.many HIDDEN_JUMPTARGET(__sigsetjmp)
END(setjmp)
LEAF(_setjmp)
alloc r8=ar.pfs,2,0,0,0
mov in1=0
- br.cond.sptk.many _GI___sigsetjmp
+ br.cond.sptk.many HIDDEN_JUMPTARGET(__sigsetjmp)
END(_setjmp)
libc_hidden_def (_setjmp)
@@ -191,7 +191,8 @@ ENTRY(__sigsetjmp)
mov r8=0
ret
END(__sigsetjmp)
-strong_alias(__sigsetjmp, _GI___sigsetjmp)
+libc_hidden_def (__sigsetjmp)
+rtld_hidden_def (__sigsetjmp)
weak_extern(_setjmp)
weak_extern(setjmp)