From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu, 26 May 2016 14:11:33 +0000 (-0300)
Subject: network: Fix missing bits from {recv,send}{m}msg standard com,pliance
X-Git-Tag: glibc-2.24~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f0dc39029ae08;p=thirdparty%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index c0b975e0941..ecedf6f6e65 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 42409289bdc..eaa6f7f2832 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 895696ebf8e..f0af95ef461 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 55d12777ef2..64d503b62d0 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;