This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH-for-2.21-and-2.22] s390-64: remove socketcall syscalls
- From: Aurelien Jarno <aurelien at aurel32 dot net>
- To: libc-alpha at sourceware dot org
- Cc: Stefan Liebler <stli at linux dot vnet dot ibm dot com>
- Date: Fri, 25 Dec 2015 03:21:38 +0100
- Subject: [PATCH-for-2.21-and-2.22] s390-64: remove socketcall syscalls
- Authentication-results: sourceware.org; auth=none
From: Stefan Liebler <stli@linux.vnet.ibm.com>
Remove socketcalls in syscalls.list for s390-64. They were never used
on s390x and produce wrong code when glibc is built against 4.3 kernel
headers.
ChangeLog:
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list:
Remove socketcall syscalls.
(partially cherry picked from commit 016495b818cb61df7d0d10e6db54074271b3e3a5)
---
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list | 19 -------------------
2 files changed, 5 insertions(+), 19 deletions(-)
This is a partial backport of commit 016495b8 which is already on master
and is needed when building glibc against 4.3+ kernel headers. Otherwise
we end up with wrong code, like this one for socket:
00000000000fb5b4 <socket@@GLIBC_2.2>:
fb5b4: a7 19 01 67 lghi %r1,359
fb5b8: 0a 00 svc 0
fb5ba: a7 49 f0 01 lghi %r4,-4095
fb5be: b9 21 00 24 clgr %r2,%r4
fb5c2: c0 b4 00 00 00 04 jgnl fb5ca <socket@@GLIBC_2.2+0x16>
fb5c8: 07 fe br %r14
fb5ca: 13 02 lcr %r0,%r2
fb5cc: c0 10 00 05 0e 3e larl %r1,19d248 <_IO_file_jumps@@GLIBC_2.2+0x6f0>
fb5d2: e3 10 10 00 00 04 lg %r1,0(%r1)
fb5d8: b2 4f 00 20 ear %r2,%a0
fb5dc: eb 22 00 20 00 0d sllg %r2,%r2,32
fb5e2: b2 4f 00 21 ear %r2,%a1
fb5e6: 50 01 20 00 st %r0,0(%r1,%r2)
fb5ea: a7 29 ff ff lghi %r2,-1
fb5ee: 07 fe br %r14
diff --git a/ChangeLog b/ChangeLog
index d96d6ef..eca0700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-25 Stefan Liebler <stli@linux.vnet.ibm.com>
+
+ * sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list:
+ Remove socketcall syscalls.
+
2015-12-17 Paul E. Murphy <murphyp@linux.vnet.ibm.com>
[BZ #19174]
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
--
2.1.4