Update.

1998-07-05  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/__sendmsg.S: Define function as
	__syscall_sendmsg.
	* sysdeps/unix/sysv/linux/__recvmsg.S: Define function as
	__syscall_recvmsg.
	* sysdeps/unix/sysv/linux/recvmsg.c: Define function as __libc_recvmsg
	and make __recvmsg and recvmsg weak aliases.
	* sysdeps/unix/sysv/linux/sendmsg.c: Likewise for sendmsg.
	* sysdeps/unix/sysv/linux/alpha/syscalls.list: Define __syscall_recvmsg
	and __syscall_sendmsg.

6 files changed, 32 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index c19873f62a..eaabfc5e57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1998-07-05  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/__sendmsg.S: Define function as
+	__syscall_sendmsg.
+	* sysdeps/unix/sysv/linux/__recvmsg.S: Define function as
+	__syscall_recvmsg.
+	* sysdeps/unix/sysv/linux/recvmsg.c: Define function as __libc_recvmsg
+	and make __recvmsg and recvmsg weak aliases.
+	* sysdeps/unix/sysv/linux/sendmsg.c: Likewise for sendmsg.
+	* sysdeps/unix/sysv/linux/alpha/syscalls.list: Define __syscall_recvmsg
+	and __syscall_sendmsg.
+
 1998-07-05 11:49  Ulrich Drepper  <drepper@cygnus.com>
 
 	* iconv/gconv_conf.c (read_conf_file): Use feof_unlocked on private
diff --git a/sysdeps/unix/sysv/linux/__recvmsg.S b/sysdeps/unix/sysv/linux/__recvmsg.S
index 515ff552aa..f76cce0913 100644
--- a/sysdeps/unix/sysv/linux/__recvmsg.S
+++ b/sysdeps/unix/sysv/linux/__recvmsg.S
@@ -1,5 +1,5 @@
-#define	socket	__recvmsg
-#define	__socket __libc_recvmsg
-#define SOCKOP___recvmsg SOCKOP_recvmsg
+#define	socket	___syscall_recvmsg
+#define	__socket __syscall_recvmsg
+#define SOCKOP____syscall_recvmsg SOCKOP_recvmsg
 #define	NARGS	3
 #include <socket.S>
diff --git a/sysdeps/unix/sysv/linux/__sendmsg.S b/sysdeps/unix/sysv/linux/__sendmsg.S
index 165ee14698..bd935bd7a9 100644
--- a/sysdeps/unix/sysv/linux/__sendmsg.S
+++ b/sysdeps/unix/sysv/linux/__sendmsg.S
@@ -1,5 +1,5 @@
-#define	socket	__sendmsg
-#define	__socket __libc_sendmsg
-#define SOCKOP___sendmsg SOCKOP_sendmsg
+#define	socket	___syscall_sendmsg
+#define	__socket __syscall_sendmsg
+#define SOCKOP____syscall_sendmsg SOCKOP_sendmsg
 #define	NARGS	3
 #include <socket.S>
diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index ff73a6dc9f..ef14984cc2 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -45,10 +45,10 @@ getsockopt	-	getsockopt	5	__getsockopt	getsockopt
 listen		-	listen		2	__listen	listen
 recv		-	recv		4	__libc_recv	__recv recv
 recvfrom	-	recvfrom	6	__libc_recvfrom	__recvfrom recvfrom
-recvmsg		-	recvmsg		3	__libc_recvmsg	__recvmsg recvmsg
+__recvmsg	-	recvmsg		3	__syscall_recvmsg
 ptrace		-	ptrace		4	__ptrace	ptrace
 send		-	send		4	__libc_send	__send send
-sendmsg		-	sendmsg		3	__libc_sendmsg	__sendmsg sendmsg
+__sendmsg	-	sendmsg		3	__syscall_sendmsg
 sendto		-	sendto		6	__libc_sendto	__sendto sendto
 setsockopt	-	setsockopt	5	__setsockopt	setsockopt
 shutdown	-	shutdown	2	__shutdown	shutdown
diff --git a/sysdeps/unix/sysv/linux/recvmsg.c b/sysdeps/unix/sysv/linux/recvmsg.c
index 04cf230828..14a3417da8 100644
--- a/sysdeps/unix/sysv/linux/recvmsg.c
+++ b/sysdeps/unix/sysv/linux/recvmsg.c
@@ -32,10 +32,10 @@ struct __kernel_ucred
   __kernel_gid_t gid;
 };
 
-extern int __recvmsg (int, struct msghdr *, int);
+extern int __syscall_recvmsg (int, struct msghdr *, int);
 
 int
-recvmsg (fd, message, flags)
+__libc_recvmsg (fd, message, flags)
      int fd;
      struct msghdr *message;
      int flags;
@@ -61,7 +61,7 @@ recvmsg (fd, message, flags)
     }
 
 
-  ret = __recvmsg (fd, message, flags);
+  ret = __syscall_recvmsg (fd, message, flags);
 
   if (ret == -1)
     return ret;
@@ -91,3 +91,6 @@ recvmsg (fd, message, flags)
       }
   return ret;
 }
+
+weak_alias (__libc_recvmsg, __recvmsg)
+weak_alias (__libc_recvmsg, recvmsg)
diff --git a/sysdeps/unix/sysv/linux/sendmsg.c b/sysdeps/unix/sysv/linux/sendmsg.c
index 8902530c2b..bc12b051e7 100644
--- a/sysdeps/unix/sysv/linux/sendmsg.c
+++ b/sysdeps/unix/sysv/linux/sendmsg.c
@@ -32,12 +32,12 @@ struct __kernel_ucred
   __kernel_gid_t gid;
 };
 
-extern int __sendmsg (int, const struct msghdr *, int);
+extern int __syscall_sendmsg (int, const struct msghdr *, int);
 
 /* Send a message described by MESSAGE on socket FD.
    Returns the number of bytes sent, or -1 for errors.  */
 int
-sendmsg (fd, message, flags)
+__libc_sendmsg (fd, message, flags)
      int fd;
      const struct msghdr *message;
      int flags;
@@ -87,5 +87,8 @@ sendmsg (fd, message, flags)
       cm = CMSG_NXTHDR ((struct msghdr *) message, cm);
     }
 
-  return __sendmsg (fd, message, flags);
+  return __syscall_sendmsg (fd, message, flags);
 }
+
+weak_alias (__libc_sendmsg, __sendmsg)
+weak_alias (__libc_sendmsg, sendmsg)