[Glibc-bsd-commits] r5831 - trunk/glibc-ports/kfreebsd

[aurel32 at alioth.debian.org]

Author: aurel32
Date: 2015-11-19 13:59:57 +0000 (Thu, 19 Nov 2015)
New Revision: 5831

Modified:
   trunk/glibc-ports/kfreebsd/getdents.c
   trunk/glibc-ports/kfreebsd/syscalls.list
Log:
Declare the FreeBSD getdents function as an alias of __syscall_getdents

This way we don't call the internal __getdents function. This fix a few
linknamespace issues in the testsuite



Modified: trunk/glibc-ports/kfreebsd/getdents.c
===================================================================
--- trunk/glibc-ports/kfreebsd/getdents.c	2015-11-18 23:08:05 UTC (rev 5830)
+++ trunk/glibc-ports/kfreebsd/getdents.c	2015-11-19 13:59:57 UTC (rev 5831)
@@ -38,13 +38,6 @@
   return __syscall_getdents (fd, buf, nbytes);
 }
 
-/* Export getdents().  Not an internal_function.  */
-ssize_t
-getdents (int fd, char *buf, size_t nbytes)
-{
-  return __syscall_getdents (fd, buf, nbytes);
-}
-
 /* Since 'struct dirent64' == 'struct dirent', the functions '__getdents64'
    and '__getdents' are equal.  */
 strong_alias (__getdents, __getdents64)

Modified: trunk/glibc-ports/kfreebsd/syscalls.list
===================================================================
--- trunk/glibc-ports/kfreebsd/syscalls.list	2015-11-18 23:08:05 UTC (rev 5830)
+++ trunk/glibc-ports/kfreebsd/syscalls.list	2015-11-19 13:59:57 UTC (rev 5831)
@@ -48,7 +48,7 @@
 sys_futimesat		-	futimesat		i:isp		__syscall_futimesat
 getcontext		-	getcontext		i:p		__getcontext getcontext
 sys_getcwd		-	getcwd			i:bn		__syscall_getcwd
-sys_getdents		-	getdents		i:ibn		__syscall_getdents
+sys_getdents		-	getdents		i:ibn		__syscall_getdents getdents
 sys_getdirentries	-	getdirentries		i:ibnP		__syscall_getdirentries
 getegid			-	getegid			i:		__getegid getegid
 geteuid			-	geteuid			i:		__geteuid geteuid