diff options
63 files changed, 464 insertions, 46 deletions
@@ -1,5 +1,111 @@ 2016-05-25 Adhemerval Zanella <adhemerval.zanella@linaro.org> + * conform/data/sys/socket.h-data (msghdr.msg_iovlen): Remove xfail- + and change to correct expected type. + (msghdr.msg_controllen): Likewise. + (cmsghdr.cmsg_len): Likewise. + * sysdeps/unix/sysv/linux/bits/socket.h (msghdr.msg_iovlen): Fix + expected POSIX assumption about the size. + (msghdr.msg_controllen): Likewise. + (msghdr.__glibc_reserved1): Likewise. + (msghdr.__glibc_reserved2): Likewise. + (cmsghdr.cmsg_len): Likewise. + (cmsghdr.__glibc_reserved1): Likewise. + * nptl/Makefile (libpthread-routines): Remove ptw-recvmsg and ptw-sendmsg. + Add ptw-oldrecvmsg and ptw-oldsendmsg. + (CFLAGS-sendmsg.c): Remove rule. + (CFLAGS-recvmsg.c): Likewise. + (CFLAGS-oldsendmsg.c): Add rule. + (CFLAGS-oldrecvmsg.c): Likewise. + * sysdeps/unix/sysv/linux/alpha/Versions [libc] (GLIBC_2.24): Add + recvmsg and sendmsg. + * sysdeps/unix/sysv/linux/aarch64/Version [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/arm/Versions [libc] (GLIBC_2.24): Likewise. + * sysdeps/unix/sysv/linux/hppa/Versions [libc] (GLIBC_2.24): Likewise. + * sysdeps/unix/sysv/linux/i386/Versions [libc] (GLIBC_2.24): Likewise. + * sysdeps/unix/sysv/linux/ia64/Versions [libc] (GLIBC_2.24): Likewise. + * sysdeps/unix/sysv/linux/m68k/Versions [libc] (GLIBC_2.24): Likewise. + * sysdeps/unix/sysv/linux/microblaze/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/mips/mips32/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/n32/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/nios2/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/powerpc/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/Versions [libc] + (GLIBC_2.24): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/s390/s390-64/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/sh/Versions [libc] (GLIBC_2.24): Likewise. + * sysdeps/unix/sysv/linux/sparc/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/Versions [libc] (GLIBC_2.24): + Likewise. + ( sysdeps/unix/sysv/linux/tile/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/Versions [libc] + (GLIBC_2.24): Likewise. + ( sysdeps/unix/sysv/linux/x86_64/64/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/x84_64/Versions [libc] (GLIBC_2.24): + Likewise. + * sysdeps/unix/sysv/linux/Makefile + [$(subdir) = socket)] (sysdep_headers): Add oldrecvmsg and oldsendmsg. + (CFLAGS-sendmsg.c): Add rule. + (CFLAGS-recvmsg.c): Likewise. + (CFLAGS-oldsendmsg.c): Likewise. + (CFLAGS-oldrecvmsg.c): Likewise. + * sysdeps/unix/sysv/linux/check_native.c (__check_native): Fix msghdr + initialization. + * sysdeps/unix/sysv/linux/check_pf.c (make_request): Likewise. + * sysdeps/unix/sysv/linux/ifaddrs.c (__netlink_request): Likewise. + * sysdeps/unix/sysv/linux/oldrecvmsg.c: New file. + * sysdeps/unix/sysv/linux/oldsendmsg.c: Likewise. + * sysdeps/unix/sysv/linux/recvmsg.c (__libc_recvmsg): Adjust msghdr + iovlen and controllen fields to adjust to POSIX specification. + * sysdeps/unix/sysv/linux/sendmsg.c (__libc_sendmsg): Likewise. + * sysdeps/unix/sysv/linux/aarch64/libc.abilist: New version and + added recvmsg and sendmsg. + * sysdeps/unix/sysv/linux/alpha/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/hppa/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/i386/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/ia64/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/microblaze/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/nios2/libc.abilist: Likewise + * sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist: + Likewise. + * sysdeps/unix/linux/powerpc/powerpc32/nofpu/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist: Likewise. + * sysdepe/unix/sysv/linux/powerpc/powerpc64/libc.abilist: Likewise. + Likewise. + Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/sh/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist: Likewise. + Likewise. + * sysdeps/unix/sysv/linux/x86_64/64/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist: Likewise. + * sysdeps/unix/sysv/linux/alpha/syscalls.list (recvmsg): Remove from auto-generation. (sendmsg): Likewise. diff --git a/conform/data/sys/socket.h-data b/conform/data/sys/socket.h-data index 442d4d288a..3a6cf7c673 100644 --- a/conform/data/sys/socket.h-data +++ b/conform/data/sys/socket.h-data @@ -22,10 +22,9 @@ type {struct msghdr} element {struct msghdr} {void*} msg_name element {struct msghdr} socklen_t msg_namelen element {struct msghdr} {struct iovec*} msg_iov -// Bug 16919: wrong type for msg_iovlen and msg_controllen members. -xfail-element {struct msghdr} int msg_iovlen +element {struct msghdr} int msg_iovlen element {struct msghdr} {void*} msg_control -xfail-element {struct msghdr} socklen_t msg_controllen +element {struct msghdr} socklen_t msg_controllen element {struct msghdr} int msg_flags type {struct iovec} @@ -35,8 +34,7 @@ element {struct iovec} size_t iov_len type {struct cmsghdr} -// Bug 16919: wrong type for cmsg_len member. -xfail-element {struct cmsghdr} socklen_t cmsg_len +element {struct cmsghdr} socklen_t cmsg_len element {struct cmsghdr} int cmsg_level element {struct cmsghdr} int cmsg_type diff --git a/nptl/Makefile b/nptl/Makefile index dc3ccab991..42409289bd 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -109,12 +109,13 @@ libpthread-routines = nptl-init vars events version pt-interp \ lll_timedlock_wait lll_timedwait_tid \ pt-fork pt-vfork \ ptw-write ptw-read ptw-close ptw-fcntl ptw-accept \ - ptw-connect ptw-recv ptw-recvfrom ptw-recvmsg ptw-send \ - ptw-sendmsg ptw-sendto ptw-fsync ptw-lseek ptw-llseek \ + ptw-connect ptw-recv ptw-recvfrom ptw-send \ + ptw-sendto ptw-fsync ptw-lseek ptw-llseek \ ptw-msync ptw-nanosleep ptw-open ptw-open64 ptw-pause \ ptw-pread ptw-pread64 ptw-pwrite ptw-pwrite64 \ ptw-tcdrain ptw-wait ptw-waitpid ptw-msgrcv ptw-msgsnd \ ptw-sigwait ptw-sigsuspend \ + ptw-oldrecvmsg ptw-oldsendmsg \ pt-raise pt-system \ flockfile ftrylockfile funlockfile \ sigaction \ @@ -204,10 +205,10 @@ CFLAGS-recv.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-send.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-accept.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-sendto.c = -fexceptions -fasynchronous-unwind-tables -CFLAGS-sendmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-connect.c = -fexceptions -fasynchronous-unwind-tables -CFLAGS-recvmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-recvfrom.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-oldrecvmsg.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-oldrecvfrom.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-pt-system.c = -fexceptions diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 9b4e2e1f7c..bbba51bda8 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -124,7 +124,11 @@ ifeq ($(subdir),socket) sysdep_headers += net/if_ppp.h net/ppp-comp.h \ net/ppp_defs.h net/if_arp.h net/route.h net/ethernet.h \ net/if_slip.h net/if_packet.h net/if_shaper.h -sysdep_routines += cmsg_nxthdr +sysdep_routines += cmsg_nxt |