[Glibc-bsd-commits] r2610 - in trunk/glibc-ports/kfreebsd: . linuxthreads

[Petr Salinger]

Author: ps-guest
Date: 2009-06-26 15:04:06 +0000 (Fri, 26 Jun 2009)
New Revision: 2610

Modified:
   trunk/glibc-ports/kfreebsd/Versions
   trunk/glibc-ports/kfreebsd/linuxthreads/Makefile
   trunk/glibc-ports/kfreebsd/shm_unlink.c
   trunk/glibc-ports/kfreebsd/unlinkat.c
Log:
another PLTs out



Modified: trunk/glibc-ports/kfreebsd/Versions
===================================================================
--- trunk/glibc-ports/kfreebsd/Versions	2009-06-26 07:48:15 UTC (rev 2609)
+++ trunk/glibc-ports/kfreebsd/Versions	2009-06-26 15:04:06 UTC (rev 2610)
@@ -92,14 +92,11 @@
     # needed by librt as INLINE_SYSCALL:
     __syscall_clock_getres; __syscall_clock_gettime; __syscall_clock_settime;
     __syscall_shm_open; __syscall_shm_unlink;
-    # needed by librt:
-    __unlink;
     # misc fixes for FreeBSD:
     __syscall_freebsd6_lseek; __syscall_freebsd6_pread; __syscall_freebsd6_pwrite;
     __syscall_lseek; __syscall_pread; __syscall_pwrite;
     __syscall_connect; __syscall_sendto;
     __syscall_cpuset_getaffinity ; __syscall_cpuset_setaffinity;
-    __sigprocmask; __ioctl;
      # global variable used in brk()
     _end;
   }

Modified: trunk/glibc-ports/kfreebsd/linuxthreads/Makefile
===================================================================
--- trunk/glibc-ports/kfreebsd/linuxthreads/Makefile	2009-06-26 07:48:15 UTC (rev 2609)
+++ trunk/glibc-ports/kfreebsd/linuxthreads/Makefile	2009-06-26 15:04:06 UTC (rev 2610)
@@ -1,3 +1,4 @@
 ifeq ($(subdir),linuxthreads)
 sysdep_routines += register-atfork unregister-atfork
+libpthread-routines += ptw-sigprocmask ptw-ioctl
 endif

Modified: trunk/glibc-ports/kfreebsd/shm_unlink.c
===================================================================
--- trunk/glibc-ports/kfreebsd/shm_unlink.c	2009-06-26 07:48:15 UTC (rev 2609)
+++ trunk/glibc-ports/kfreebsd/shm_unlink.c	2009-06-26 15:04:06 UTC (rev 2610)
@@ -25,6 +25,8 @@
 extern int __syscall_shm_unlink (const char *name);
 libc_hidden_proto (__syscall_shm_unlink)
 
+libc_hidden_proto (__unlink)
+
 /* Unlink a shared memory object.  */
 int
 shm_unlink (const char *name)
@@ -35,7 +37,11 @@
 #ifndef __ASSUME_POSIXSHM_SYSCALL
   /* New syscall not available, simply unlink the file. */
   if (result == -1 && errno == ENOSYS)
-    result = __unlink (name);
+# ifdef NOT_IN_libc
+    return unlink (name);
+# else
+    return __unlink (name);
+# endif
 #endif
 
   return result;

Modified: trunk/glibc-ports/kfreebsd/unlinkat.c
===================================================================
--- trunk/glibc-ports/kfreebsd/unlinkat.c	2009-06-26 07:48:15 UTC (rev 2609)
+++ trunk/glibc-ports/kfreebsd/unlinkat.c	2009-06-26 15:04:06 UTC (rev 2610)
@@ -32,6 +32,8 @@
 extern int __syscall_unlinkat (int fd, const char *file, int flag);
 libc_hidden_proto (__syscall_unlinkat)
 
+libc_hidden_proto (__unlink)
+
 /* Remove the link named NAME.  */
 int
 unlinkat (fd, file, flag)