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.22-519-g37d13b1
- From: krebbel at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 9 Nov 2015 15:15:31 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-519-g37d13b1
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 37d13b179cd726bb6d61bfe2f31a1206bc1d9703 (commit)
via 016495b818cb61df7d0d10e6db54074271b3e3a5 (commit)
from 2eecc8afd02d8c65cf098cbae4de87f332dc21bd (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=37d13b179cd726bb6d61bfe2f31a1206bc1d9703
commit 37d13b179cd726bb6d61bfe2f31a1206bc1d9703
Author: Stefan Liebler <stli@linux.vnet.ibm.com>
Date: Mon Nov 9 16:14:49 2015 +0100
S390: Clean setjmp, longjmp, getcontext symbols.
For each function setjmp, longjmp, getcontext, there exist a symbol
<func> and a default/versioned symbol <func>@@GLIBC_2.x in the build
obj-files.
This is wrong because it should only exist an unversioned or a
default-versioned symbol with the same name in an obj-file.
Glibc can't be build with recent binutils. See the already fixed linker
bug https://sourceware.org/bugzilla/show_bug.cgi?id=19073.
Nevertheless, this patch cleans this up.
Furthermore the BSD entry points setjmp, _setjmp were marked as weak,
but should be strong as on other architectures.
(see https://sourceware.org/ml/libc-alpha/2014-07/msg00568.html for an
older discussion with Andreas Schwab)
Some whitespace issues are corrected in sysdeps/s390/s390-64/setjmp.S,
too. But there is no change in the assembler code.
ChangeLog:
* sysdeps/s390/longjmp.c (longjmp, _longjmp, siglongjmp):
Don't create weak aliases,
because versioned symbols are created later.
* sysdeps/s390/s390-32/setjmp.S
(setjmp, _setjmp): Remove weak and rename to an unique name
in SHARED case due to existing versioned symbols.
* sysdeps/s390/s390-64/setjmp.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S
(getcontext): Create weak alias only in non SHARED case.
* sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S: Likewise.
diff --git a/ChangeLog b/ChangeLog
index f8cd164..2918a23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2015-11-09 Stefan Liebler <stli@linux.vnet.ibm.com>
+ * sysdeps/s390/longjmp.c (longjmp, _longjmp, siglongjmp):
+ Don't create weak aliases,
+ because versioned symbols are created later.
+ * sysdeps/s390/s390-32/setjmp.S
+ (setjmp, _setjmp): Remove weak and rename to an unique name
+ in SHARED case due to existing versioned symbols.
+ * sysdeps/s390/s390-64/setjmp.S: Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S
+ (getcontext): Create weak alias only in non SHARED case.
+ * sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S: Likewise.
+
+2015-11-09 Stefan Liebler <stli@linux.vnet.ibm.com>
+
* sysdeps/unix/sysv/linux/s390/kernel-features.h:
(__ASSUME_*_SYSCALL) Define new macros.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list:
diff --git a/sysdeps/s390/longjmp.c b/sysdeps/s390/longjmp.c
index 9b6fa54..cd2c842 100644
--- a/sysdeps/s390/longjmp.c
+++ b/sysdeps/s390/longjmp.c
@@ -20,11 +20,21 @@
#include <shlib-compat.h>
+#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
+/* We don't want the weak alias to longjmp, _longjmp, siglongjmp here,
+ because we create the default/versioned symbols later. */
+# define __libc_siglongjmp __libc_siglongjmp
+#endif /* SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */
+
#include <setjmp/longjmp.c>
#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
/* In glibc release 2.19 new versions of longjmp-functions were introduced,
but were reverted before 2.20. Thus both versions are the same function. */
+
+strong_alias (__libc_siglongjmp, __libc_longjmp)
+libc_hidden_def (__libc_longjmp)
+
weak_alias (__libc_siglongjmp, __v1_longjmp)
weak_alias (__libc_siglongjmp, __v2_longjmp)
versioned_symbol (libc, __v1_longjmp, _longjmp, GLIBC_2_0);
diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S
index e068a3c..3543c65 100644
--- a/sysdeps/s390/s390-32/setjmp.S
+++ b/sysdeps/s390/s390-32/setjmp.S
@@ -27,21 +27,23 @@
#if !IS_IN (rtld)
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
/* we need a unique name in case of symbol versioning. */
+# define setjmp __v1setjmp
+# define _setjmp __v1_setjmp
# define __sigsetjmp __v1__sigsetjmp
+
+# undef libc_hidden_def
+# define libc_hidden_def(name) strong_alias(_setjmp, __GI__setjmp)
# endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */
#endif /* !IS_IN (rtld) */
- /* We include the BSD entry points here as well but we make
- them weak. */
+ /* We include the BSD entry points here as well. */
ENTRY (setjmp)
- .weak C_SYMBOL_NAME (setjmp)
lhi %r3,1 /* second argument of one */
j .Linternal_sigsetjmp /* branch relativ to __sigsetjmp */
END (setjmp)
/* Binary compatibility entry point. */
ENTRY(_setjmp)
- .weak C_SYMBOL_NAME (_setjmp)
lhi %r3,0 /* second argument of zero */
j .Linternal_sigsetjmp /* branch relativ to __sigsetjmp */
END (_setjmp)
@@ -96,15 +98,15 @@ END (__sigsetjmp)
/* In glibc release 2.19 new versions of setjmp-functions were introduced,
but were reverted before 2.20. Thus both versions are the same function. */
+# undef setjmp
+# undef _setjmp
# undef __sigsetjmp
-weak_alias (setjmp, __v1setjmp);
-weak_alias (setjmp, __v2setjmp);
+strong_alias (__v1setjmp, __v2setjmp);
versioned_symbol (libc, __v1setjmp, setjmp, GLIBC_2_0);
compat_symbol (libc, __v2setjmp, setjmp, GLIBC_2_19);
-weak_alias (_setjmp, __v1_setjmp);
-weak_alias (_setjmp, __v2_setjmp);
+strong_alias (__v1_setjmp, __v2_setjmp);
versioned_symbol (libc, __v1_setjmp, _setjmp, GLIBC_2_0);
compat_symbol (libc, __v2_setjmp, _setjmp, GLIBC_2_19);
diff --git a/sysdeps/s390/s390-64/setjmp.S b/sysdeps/s390/s390-64/setjmp.S
index 330a8e6..ae48ab4 100644
--- a/sysdeps/s390/s390-64/setjmp.S
+++ b/sysdeps/s390/s390-64/setjmp.S
@@ -27,29 +27,31 @@
#if !IS_IN (rtld)
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
/* we need a unique name in case of symbol versioning. */
+# define setjmp __v1setjmp
+# define _setjmp __v1_setjmp
# define __sigsetjmp __v1__sigsetjmp
+
+# undef libc_hidden_def
+# define libc_hidden_def(name) strong_alias(_setjmp, __GI__setjmp)
# endif /* if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */
#endif /* !IS_IN (rtld) */
- /* We include the BSD entry points here as well but we make
- them weak. */
+ /* We include the BSD entry points here as well. */
ENTRY (setjmp)
- .weak C_SYMBOL_NAME (setjmp)
- lghi %r3,1 /* Second argument of one. */
- j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */
+ lghi %r3,1 /* Second argument of one. */
+ j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */
END (setjmp)
/* Binary compatibility entry point. */
ENTRY(_setjmp)
- .weak C_SYMBOL_NAME (_setjmp)
- slgr %r3,%r3 /* Second argument of zero. */
- j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */
+ slgr %r3,%r3 /* Second argument of zero. */
+ j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */
END (_setjmp)
libc_hidden_def (_setjmp)
ENTRY(__setjmp)
- slgr %r3,%r3 /* Second argument of zero. */
- j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */
+ slgr %r3,%r3 /* Second argument of zero. */
+ j .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp. */
END (__setjmp)
ENTRY(__sigsetjmp)
@@ -65,7 +67,7 @@ ENTRY(__sigsetjmp)
PTR_MANGLE2 (%r5, %r1)
stmg %r4,%r5,64(%r2)
#else
- stmg %r6,%r15,0(%r2) /* Store registers in jmp_buf. */
+ stmg %r6,%r15,0(%r2) /* Store registers in jmp_buf. */
#endif
std %f8,80(%r2)
std %f9,88(%r2)
@@ -80,7 +82,7 @@ ENTRY(__sigsetjmp)
lghi %r2,0
br %r14
#elif defined PIC
- jg __sigjmp_save@PLT /* Branch to PLT of __sigsetjmp. */
+ jg __sigjmp_save@PLT /* Branch to PLT of __sigsetjmp. */
#else
jg __sigjmp_save
#endif
@@ -91,15 +93,15 @@ END (__sigsetjmp)
/* In glibc release 2.19 new versions of setjmp-functions were introduced,
but were reverted before 2.20. Thus both versions are the same function. */
+# undef setjmp
+# undef _setjmp
# undef __sigsetjmp
-weak_alias (setjmp, __v1setjmp);
-weak_alias (setjmp, __v2setjmp);
+strong_alias (__v1setjmp, __v2setjmp);
versioned_symbol (libc, __v1setjmp, setjmp, GLIBC_2_0);
compat_symbol (libc, __v2setjmp, setjmp, GLIBC_2_19);
-weak_alias (_setjmp, __v1_setjmp);
-weak_alias (_setjmp, __v2_setjmp);
+strong_alias (__v1_setjmp, __v2_setjmp);
versioned_symbol (libc, __v1_setjmp, _setjmp, GLIBC_2_0);
compat_symbol (libc, __v2_setjmp, _setjmp, GLIBC_2_19);
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S b/sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S
index 9b477b5..e1a9740 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S
@@ -74,8 +74,6 @@ ENTRY(__getcontext)
br %r14
END(__getcontext)
-weak_alias (__getcontext, getcontext)
-
#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
/* In glibc release 2.19 a new version of getcontext was introduced,
but was reverted before 2.20. Thus both versions are the same function. */
@@ -83,4 +81,9 @@ weak_alias (__getcontext, __v1__getcontext)
weak_alias (__getcontext, __v2__getcontext)
versioned_symbol (libc, __v1__getcontext, getcontext, GLIBC_2_1)
compat_symbol (libc, __v2__getcontext, getcontext, GLIBC_2_19)
-#endif
+
+#else
+
+weak_alias (__getcontext, getcontext)
+
+#endif /* !(defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)) */
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S b/sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S
index e781ce7..9a118b7 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S
@@ -74,8 +74,6 @@ ENTRY(__getcontext)
br %r14
END(__getcontext)
-weak_alias (__getcontext, getcontext)
-
#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
/* In glibc release 2.19 a new version of getcontext was introduced,
but was reverted before 2.20. Thus both versions are the same function. */
@@ -83,4 +81,9 @@ weak_alias (__getcontext, __v1__getcontext)
weak_alias (__getcontext, __v2__getcontext)
versioned_symbol (libc, __v1__getcontext, getcontext, GLIBC_2_1)
compat_symbol (libc, __v2__getcontext, getcontext, GLIBC_2_19)
-#endif
+
+#else
+
+weak_alias (__getcontext, getcontext)
+
+#endif /* !(defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)) */
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=016495b818cb61df7d0d10e6db54074271b3e3a5
commit 016495b818cb61df7d0d10e6db54074271b3e3a5
Author: Stefan Liebler <stli@linux.vnet.ibm.com>
Date: Mon Nov 9 16:14:49 2015 +0100
S390: Call direct system calls for socket operations.
this patch calls direct system calls for socket operations in the same way as power does. The system calls were introduced in kernel commit https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=977108f89c989b1eeb5c8d938e1e71913391eb5f.
There are no direct recv, send, accept syscalls available on s390. Thus
recvfrom, sendto, accept4 are called instead of the socketcall by defining __ASSUME_*_FOR_*_SYSCALL macros. See recv.c, send.c, accept.c in sysdeps/unix/sysv/linux/ folder.
The socketcalls in syscalls.list for s390-64 are removed. They were never used on s390x.
ChangeLog:
* sysdeps/unix/sysv/linux/s390/kernel-features.h:
(__ASSUME_*_SYSCALL) Define new macros.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list:
Remove socketcall syscalls.
* sysdeps/unix/sysv/linux/accept.c (__libc_accept):
Use accept4 if defined __ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL.
* sysdeps/unix/sysv/linux/recv.c (__libc_recv):
Use recvfrom if defined __ASSUME_RECVFROM_FOR_RECV_SYSCALL.
* sysdeps/unix/sysv/linux/send.c (__libc_send):
Use sendto if defined __ASSUME_SENDTO_FOR_SEND_SYSCALL.
diff --git a/ChangeLog b/ChangeLog
index 3acc71c..f8cd164 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2015-11-09 Stefan Liebler <stli@linux.vnet.ibm.com>
+
+ * sysdeps/unix/sysv/linux/s390/kernel-features.h:
+ (__ASSUME_*_SYSCALL) Define new macros.
+ * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list:
+ Remove socketcall syscalls.
+ * sysdeps/unix/sysv/linux/accept.c (__libc_accept):
+ Use accept4 if defined __ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL.
+ * sysdeps/unix/sysv/linux/recv.c (__libc_recv):
+ Use recvfrom if defined __ASSUME_RECVFROM_FOR_RECV_SYSCALL.
+ * sysdeps/unix/sysv/linux/send.c (__libc_send):
+ Use sendto if defined __ASSUME_SENDTO_FOR_SEND_SYSCALL.
+
2015-11-09 Florian Weimer <fweimer@redhat.com>
[BZ #12926]
diff --git a/sysdeps/unix/sysv/linux/accept.c b/sysdeps/unix/sysv/linux/accept.c
index 8b4fff0..f536133 100644
--- a/sysdeps/unix/sysv/linux/accept.c
+++ b/sysdeps/unix/sysv/linux/accept.c
@@ -29,6 +29,8 @@ __libc_accept (int fd, __SOCKADDR_ARG addr, socklen_t *len)
{
#ifdef __ASSUME_ACCEPT_SYSCALL
return SYSCALL_CANCEL (accept, fd, addr.__sockaddr__, len);
+#elif defined __ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL
+ return SYSCALL_CANCEL (accept4, fd, addr.__sockaddr__, len, 0);
#else
return SOCKETCALL_CANCEL (accept, fd, addr.__sockaddr__, len);
#endif
diff --git a/sysdeps/unix/sysv/linux/recv.c b/sysdeps/unix/sysv/linux/recv.c
index 12be890..ce701b5 100644
--- a/sysdeps/unix/sysv/linux/recv.c
+++ b/sysdeps/unix/sysv/linux/recv.c
@@ -29,6 +29,8 @@ __libc_recv (int fd, void *buf, size_t len, int flags)
{
#ifdef __ASSUME_RECV_SYSCALL
return SYSCALL_CANCEL (recv, fd, buf, len, flags);
+#elif defined __ASSUME_RECVFROM_FOR_RECV_SYSCALL
+ return SYSCALL_CANCEL (recvfrom, fd, buf, len, flags, NULL, NULL);
#else
return SOCKETCALL_CANCEL (recv, fd, buf, len, flags);
#endif
diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h
index 96f73ef..eaa3483 100644
--- a/sysdeps/unix/sysv/linux/s390/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h
@@ -20,4 +20,28 @@
/* S/390 uses socketcall. */
#define __ASSUME_SOCKETCALL 1
+/* Direct socketcalls available with kernel 4.3. */
+#if __LINUX_KERNEL_VERSION >= 0x040300
+# define __ASSUME_RECVMMSG_SYSCALL 1
+# define __ASSUME_SENDMMSG_SYSCALL 1
+# define __ASSUME_SOCKET_SYSCALL 1
+# define __ASSUME_SOCKETPAIR_SYSCALL 1
+# define __ASSUME_BIND_SYSCALL 1
+# define __ASSUME_CONNECT_SYSCALL 1
+# define __ASSUME_LISTEN_SYSCALL 1
+# define __ASSUME_ACCEPT4_SYSCALL 1
+# define __ASSUME_ACCEPT4_FOR_ACCEPT_SYSCALL 1
+# define __ASSUME_GETSOCKOPT_SYSCALL 1
+# define __ASSUME_SETSOCKOPT_SYSCALL 1
+# define __ASSUME_GETSOCKNAME_SYSCALL 1
+# define __ASSUME_GETPEERNAME_SYSCALL 1
+# define __ASSUME_SENDTO_SYSCALL 1
+# define __ASSUME_SENDTO_FOR_SEND_SYSCALL 1
+# define __ASSUME_SENDMSG_SYSCALL 1
+# define __ASSUME_RECVFROM_SYSCALL 1
+# define __ASSUME_RECVFROM_FOR_RECV_SYSCALL 1
+# define __ASSUME_RECVMSG_SYSCALL 1
+# define __ASSUME_SHUTDOWN_SYSCALL 1
+#endif
+
#include_next <kernel-features.h>
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
index 5b8c102..9f03d26 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
@@ -12,22 +12,3 @@ shmget - shmget i:iii __shmget shmget
semop - semop i:ipi __semop semop
semget - semget i:iii __semget semget
semctl - semctl i:iiii __semctl semctl
-
-# proper socket implementations:
-accept - accept Ci:iBN __libc_accept __accept accept
-bind - bind i:ipi __bind bind
-connect - connect Ci:ipi __libc_connect __connect connect
-getpeername - getpeername i:ipp __getpeername getpeername
-getsockname - getsockname i:ipp __getsockname getsockname
-getsockopt - getsockopt i:iiiBN __getsockopt getsockopt
-listen - listen i:ii __listen listen
-recv - recv Ci:ibni __libc_recv __recv recv
-recvfrom - recvfrom Ci:ibniBN __libc_recvfrom __recvfrom recvfrom
-recvmsg - recvmsg Ci:ipi __libc_recvmsg __recvmsg recvmsg
-send - send Ci:ibni __libc_send __send send
-sendmsg - sendmsg Ci:ipi __libc_sendmsg __sendmsg sendmsg
-sendto - sendto Ci:ibnibn __libc_sendto __sendto sendto
-setsockopt - setsockopt i:iiibn __setsockopt setsockopt
-shutdown - shutdown i:ii __shutdown shutdown
-socket - socket i:iii __socket socket
-socketpair - socketpair i:iiif __socketpair socketpair
diff --git a/sysdeps/unix/sysv/linux/send.c b/sysdeps/unix/sysv/linux/send.c
index d917e4d..529c27d 100644
--- a/sysdeps/unix/sysv/linux/send.c
+++ b/sysdeps/unix/sysv/linux/send.c
@@ -29,6 +29,8 @@ __libc_send (int fd, const void *buf, size_t len, int flags)
{
#ifdef __ASSUME_SEND_SYSCALL
return SYSCALL_CANCEL (send, fd, buf, len, flags);
+#elif defined __ASSUME_SENDTO_FOR_SEND_SYSCALL
+ return SYSCALL_CANCEL (sendto, fd, buf, len, flags, NULL, 0);
#else
return SOCKETCALL_CANCEL (send, fd, buf, len, flags);
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 26 +++++++++++++++
sysdeps/s390/longjmp.c | 10 ++++++
sysdeps/s390/s390-32/setjmp.S | 18 ++++++-----
sysdeps/s390/s390-64/setjmp.S | 34 ++++++++++---------
sysdeps/unix/sysv/linux/accept.c | 2 +
sysdeps/unix/sysv/linux/recv.c | 2 +
sysdeps/unix/sysv/linux/s390/kernel-features.h | 24 ++++++++++++++
sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S | 9 +++--
sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S | 9 +++--
sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list | 19 -----------
sysdeps/unix/sysv/linux/send.c | 2 +
11 files changed, 106 insertions(+), 49 deletions(-)
hooks/post-receive
--
GNU C Library master sources