summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-09-18 12:22:36 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-09-18 12:22:47 -0700
commit94afa0a5f38315a44cf4ec36d3027e103e16cfc0 (patch)
treed298cc8a5172238fcdbe758addceba1dc3639d48 /ChangeLog
parent3ee578690f35942f41926cc2d98e25b3d0d08c71 (diff)
downloadglibc-94afa0a5f38315a44cf4ec36d3027e103e16cfc0.tar.gz
glibc-94afa0a5f38315a44cf4ec36d3027e103e16cfc0.tar.xz
glibc-94afa0a5f38315a44cf4ec36d3027e103e16cfc0.zip
Use __libc_ptf_call in _longjmp_unwind
Use __libc_ptf_call in _longjmp_unwind to avoid duplicated logic.  On
x86-64, I got

jmp-unwind.os:
_longjmp_unwind:
	movl	__libc_pthread_functions_init(%rip), %eax
	testl	%eax, %eax
	jne	.L4
	rep ret
.L4:
	movq	304+__libc_pthread_functions(%rip), %rax
	movq	%rsp, %rsi
	ror $2*8+1, %rax
	xor %fs:48, %rax
	jmp	*%rax

jmp-unwind.o:

_longjmp_unwind:
	movl	$__pthread_cleanup_upto, %eax
	testq	%rax, %rax
	je	.L1
	movq	%rsp, %rsi
	jmp	__pthread_cleanup_upto
.L1:
	rep ret

	* sysdeps/nptl/jmp-unwind.c: Include <libc-lock.h> instead of
	<nptl/pthreadP.h>.
	(_longjmp_unwind): Use __libc_ptf_call.
	* sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Likewise.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 764af43e1e..03e23409ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-09-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/nptl/jmp-unwind.c: Include <libc-lock.h> instead of
+	<nptl/pthreadP.h>.
+	(_longjmp_unwind): Use __libc_ptf_call.
+	* sysdeps/unix/sysv/linux/s390/jmp-unwind.c: Likewise.
+
 2015-09-18  David Lamparter  <equinox-gentoo@diac24.net>
 
 	* sysdeps/arm/setjmp.S: Change PIC to SHARED.