[prev in list] [next in list] [prev in thread] [next in thread] 

List:       glibc-alpha
Subject:    [PATCH/committed] ia64: setjmp: use HIDDEN_JUMPTARGET
From:       Mike Frysinger <vapier () gentoo ! org>
Date:       2013-12-30 13:17:02
Message-ID: 1388409422-575-1-git-send-email-vapier () gentoo ! org
[Download RAW message or body]

Rather than opencode the __GI_xxx logic, use proper hidden helpers.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 ports/ChangeLog.ia64                        | 8 ++++++++
 ports/sysdeps/unix/sysv/linux/ia64/setjmp.S | 7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index 8e9b24d..b5c426e 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 a8d06cc..bf1b980 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)
-- 
1.8.4.3

[prev in list] [next in list] [prev in thread] [next in thread]