summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-05-26 11:11:33 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-05-26 11:11:33 -0300
commit2f0dc39029ae08cbed2f65d21501b3e329895e7d (patch)
tree3d4817e4b4fc5726c69f1b05d4a15b3755e1162a
parent222c2d7f4357d66073176f3beec67af40f0486c7 (diff)
downloadglibc-2f0dc39029ae08cbed2f65d21501b3e329895e7d.tar.gz
glibc-2f0dc39029ae08cbed2f65d21501b3e329895e7d.tar.xz
glibc-2f0dc39029ae08cbed2f65d21501b3e329895e7d.zip
network: Fix missing bits from {recv,send}{m}msg standard com,pliance
This patch fixes wrong/missing bits from the Fix {recv,send}{m}msg
standard compliance (BZ#16919) patches:

  * nptl/Makefile sets CFLAGS-oldrecvfrom.c, but there's no such file as
    oldrecvfrom.c.  It should be oldsendmsg.c as defined by ChangeLog.

  * sysdeps/unix/sysv/linux/hppa/Versions and
    sysdeps/unix/sysv/linux/i386/Versions list a symbol recvms instead of
    recvmsg at version GLIBC_2.24.

	* nptl/Makefile (CFLAGS-oldrecvfrom.c): Remove rule.
	(CFLAGS-oldsendmsg.c): Add rule.
	* sysdeps/unix/sysv/linux/hppa/Versions [libc] (GLIBC_2.24):
	Correct recvmsg symbol name.
	* sysdeps/unix/sysv/linux/i386/Versions [libc] (GLIBC_2.24):
	Likewise.
-rw-r--r--ChangeLog9
-rw-r--r--nptl/Makefile2
-rw-r--r--sysdeps/unix/sysv/linux/hppa/Versions2
-rw-r--r--sysdeps/unix/sysv/linux/i386/Versions2
4 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c0b975e094..ecedf6f6e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-05-26  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* nptl/Makefile (CFLAGS-oldrecvfrom.c): Remove rule.
+	(CFLAGS-oldsendmsg.c): Add rule.
+	* sysdeps/unix/sysv/linux/hppa/Versions [libc] (GLIBC_2.24):
+	Correct recvmsg symbol name.
+	* sysdeps/unix/sysv/linux/i386/Versions [libc] (GLIBC_2.24):
+	Likewise.
+
 2016-05-25  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/unix/sysv/linux/Makefile
diff --git a/nptl/Makefile b/nptl/Makefile
index 42409289bd..eaa6f7f283 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -208,7 +208,7 @@ CFLAGS-sendto.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-connect.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-oldsendmsg.c = -fexceptions -fasynchronous-unwind-tables
 
 CFLAGS-pt-system.c = -fexceptions
 
diff --git a/sysdeps/unix/sysv/linux/hppa/Versions b/sysdeps/unix/sysv/linux/hppa/Versions
index 895696ebf8..f0af95ef46 100644
--- a/sysdeps/unix/sysv/linux/hppa/Versions
+++ b/sysdeps/unix/sysv/linux/hppa/Versions
@@ -36,6 +36,6 @@ libc {
     fanotify_mark;
   }
   GLIBC_2.24 {
-    recvms; sendmsg;
+    recvmsg; sendmsg;
   }
 }
diff --git a/sysdeps/unix/sysv/linux/i386/Versions b/sysdeps/unix/sysv/linux/i386/Versions
index 55d12777ef..64d503b62d 100644
--- a/sysdeps/unix/sysv/linux/i386/Versions
+++ b/sysdeps/unix/sysv/linux/i386/Versions
@@ -46,7 +46,7 @@ libc {
     fallocate64;
   }
   GLIBC_2.24 {
-    recvms; sendmsg;
+    recvmsg; sendmsg;
   }
   GLIBC_PRIVATE {
     __modify_ldt;