This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.23-335-g16cd2b3
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 18 May 2016 20:44:08 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-335-g16cd2b3
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 16cd2b35c295dd7a6655969c7d5a217058de2863 (commit)
via d29261db22b797e1670730f819f9296251dd42ea (commit)
from 48526672b61d8cf65ac7aba40053a81498183104 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=16cd2b35c295dd7a6655969c7d5a217058de2863
commit 16cd2b35c295dd7a6655969c7d5a217058de2863
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed May 18 13:43:09 2016 -0700
Don't call internal _Unwind_Resume via PLT
There is no need to call the internal funtion, _Unwind_Resume, which
is defined in unwind-forcedunwind.c, via PLT.
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
(__condvar_cleanup2): Remove JUMPTARGET from _Unwind_Resume
call.
* sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
(__condvar_cleanup1): Likewise.
diff --git a/ChangeLog b/ChangeLog
index 02db57a..6fd5c45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2016-05-18 H.J. Lu <hongjiu.lu@intel.com>
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+ (__condvar_cleanup2): Remove JUMPTARGET from _Unwind_Resume
+ call.
+ * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+ (__condvar_cleanup1): Likewise.
+
+2016-05-18 H.J. Lu <hongjiu.lu@intel.com>
+
* sysdeps/unix/sysv/linux/x86_64/cancellation.S (PTHREAD_UNWIND):
New
(__pthread_unwind): Renamed to ...
diff --git a/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
index a2adc09..82ffa1a 100644
--- a/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
@@ -586,7 +586,7 @@ __condvar_cleanup2:
movq FRAME_SIZE+16(%rsp), %r13
movq FRAME_SIZE+24(%rsp), %r12
.LcallUR:
- call JUMPTARGET(_Unwind_Resume)
+ call _Unwind_Resume
hlt
.LENDCODE:
cfi_endproc
diff --git a/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
index c4d3504..c82f37b 100644
--- a/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+++ b/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
@@ -518,7 +518,7 @@ __condvar_cleanup1:
8: movq 24(%rsp), %rdi
.LcallUR:
- call JUMPTARGET(_Unwind_Resume)
+ call _Unwind_Resume
hlt
.LENDCODE:
cfi_endproc
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d29261db22b797e1670730f819f9296251dd42ea
commit d29261db22b797e1670730f819f9296251dd42ea
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed May 18 13:41:43 2016 -0700
Don't call internal __pthread_unwind via PLT
Add PTHREAD_UNWIND to replace JUMPTARGET(__pthread_unwind) and define
it to __GI___pthread_unwind within libpthread.
* sysdeps/unix/sysv/linux/x86_64/cancellation.S (PTHREAD_UNWIND):
New
(__pthread_unwind): Renamed to ...
(PTHREAD_UNWIND): This.
(__pthread_enable_asynccancel): Replace
JUMPTARGET(__pthread_unwind) with PTHREAD_UNWIND.
diff --git a/ChangeLog b/ChangeLog
index ee3cb0e..02db57a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-05-18 H.J. Lu <hongjiu.lu@intel.com>
+
+ * sysdeps/unix/sysv/linux/x86_64/cancellation.S (PTHREAD_UNWIND):
+ New
+ (__pthread_unwind): Renamed to ...
+ (PTHREAD_UNWIND): This.
+ (__pthread_enable_asynccancel): Replace
+ JUMPTARGET(__pthread_unwind) with PTHREAD_UNWIND.
+
2016-05-18 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/bits/sched.h [__USE_GNU]
diff --git a/sysdeps/unix/sysv/linux/x86_64/cancellation.S b/sysdeps/unix/sysv/linux/x86_64/cancellation.S
index 04a0e59..bd22aa0 100644
--- a/sysdeps/unix/sysv/linux/x86_64/cancellation.S
+++ b/sysdeps/unix/sysv/linux/x86_64/cancellation.S
@@ -21,9 +21,11 @@
#include <kernel-features.h>
#include "lowlevellock.h"
+#define PTHREAD_UNWIND JUMPTARGET(__pthread_unwind)
#if IS_IN (libpthread)
# if defined SHARED && !defined NO_HIDDEN
-# define __pthread_unwind __GI___pthread_unwind
+# undef PTHREAD_UNWIND
+# define PTHREAD_UNWIND __GI___pthread_unwind
# endif
#else
# ifndef SHARED
@@ -76,7 +78,7 @@ ENTRY(__pthread_enable_asynccancel)
lock
orl $TCB_EXITING_BITMASK, %fs:CANCELHANDLING
mov %fs:CLEANUP_JMP_BUF, %RDI_LP
- call JUMPTARGET(__pthread_unwind)
+ call PTHREAD_UNWIND
hlt
END(__pthread_enable_asynccancel)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 17 +++++++++++++++++
sysdeps/unix/sysv/linux/x86_64/cancellation.S | 6 ++++--
.../sysv/linux/x86_64/pthread_cond_timedwait.S | 2 +-
sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S | 2 +-
4 files changed, 23 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources