[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4202 - in glibc-package/branches/eglibc-2.11/debian: . patches patches/kfreebsd



Author: ps-guest
Date: 2010-02-16 15:30:12 +0000 (Tue, 16 Feb 2010)
New Revision: 4202

Removed:
   glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-ftw.diff
Modified:
   glibc-package/branches/eglibc-2.11/debian/changelog
   glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-syscalls_2.11.patch
   glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-sysdeps.diff
   glibc-package/branches/eglibc-2.11/debian/patches/series.kfreebsd-amd64
   glibc-package/branches/eglibc-2.11/debian/patches/series.kfreebsd-i386
Log:
merge kfreebsd changes from 2.10
add one more kfreebsd errno value to be exported in 2.11 version



Modified: glibc-package/branches/eglibc-2.11/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/changelog	2010-02-16 14:59:01 UTC (rev 4201)
+++ glibc-package/branches/eglibc-2.11/debian/changelog	2010-02-16 15:30:12 UTC (rev 4202)
@@ -94,8 +94,13 @@
   * debian/*symbols*: simplify symbol files by using the new #PACKAGE#
     feature.
   * Bump to Standards-Version 3.8.4.
-  * kfreebsd/local-sysdeps.diff: update to revision 2974 (from glibc-bsd).
 
+  [ Petr Salinger]
+  * kfreebsd/local-sysdeps.diff: update to revision 2986 (from glibc-bsd).
+  * Drop kfreebsd/local-ftw.diff, use *at functions as other architectures,
+    the 8.0 kernel supports them as native, 
+    under previous kernels we have limited emulation.
+
  -- Aurelien Jarno <aurel32@debian.org>  Mon, 08 Feb 2010 19:20:38 +0100
 
 eglibc (2.10.2-6) unstable; urgency=low

Deleted: glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-ftw.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-ftw.diff	2010-02-16 14:59:01 UTC (rev 4201)
+++ glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-ftw.diff	2010-02-16 15:30:12 UTC (rev 4202)
@@ -1,124 +0,0 @@
-
-disable usage of unimplemented *at functions
-revert to previous behaviour, inspired by
-	http://sourceware.org/ml/glibc-cvs/2006-q1/msg00636.html
-	http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/io/ftw.c.diff?cvsroot=glibc&r1=1.50&r2=1.51
-
-	http://sourceware.org/cgi-bin/cvsweb.cgi/libc/posix/glob.c.diff?cvsroot=glibc&r1=1.77&r2=1.78
-
----
- io/ftw.c     |    6 ++++++
- posix/glob.c |   31 +++----------------------------
- 2 files changed, 9 insertions(+), 28 deletions(-)
-
---- a/io/ftw.c
-+++ b/io/ftw.c
-@@ -338,6 +338,7 @@
-     {
-       assert (data->dirstreams[data->actdir] == NULL);
- 
-+#if 0
-       if (dfdp != NULL && *dfdp != -1)
- 	{
- 	  int fd = openat64_not_cancel_3 (*dfdp, data->dirbuf + data->ftw.base,
-@@ -347,6 +348,7 @@
- 	    close_not_cancel_no_status (fd);
- 	}
-       else
-+#endif      
- 	{
- 	  const char *name;
- 
-@@ -410,10 +412,12 @@
-   *((char *) __mempcpy (data->dirbuf + data->ftw.base, name, namlen)) = '\0';
- 
-   int statres;
-+#if 0  
-   if (dir->streamfd != -1)
-     statres = FXSTATAT (_STAT_VER, dir->streamfd, name, &st,
- 			(data->flags & FTW_PHYS) ? AT_SYMLINK_NOFOLLOW : 0);
-   else
-+#endif  
-     {
-       if ((data->flags & FTW_CHDIR) == 0)
- 	name = data->dirbuf;
-@@ -433,10 +437,12 @@
- 	flag = FTW_SLN;
-       else
- 	{
-+#if 0	
- 	  if (dir->streamfd != -1)
- 	    statres = FXSTATAT (_STAT_VER, dir->streamfd, name, &st,
- 				AT_SYMLINK_NOFOLLOW);
- 	  else
-+#endif	  
- 	    statres = LXSTAT (_STAT_VER, name, &st);
- 	  if (statres == 0 && S_ISLNK (st.st_mode))
- 	    flag = FTW_SLN;
---- a/posix/glob.c
-+++ b/posix/glob.c
-@@ -1222,42 +1222,21 @@
-    allocated with alloca to be recycled.  */
- #if !defined _LIBC || !defined GLOB_ONLY_P
- static int
--__attribute_noinline__
--link_exists2_p (const char *dir, size_t dirlen, const char *fname,
--	       glob_t *pglob
--# ifndef _LIBC
--		, int flags
--# endif
--		)
-+link_exists_p (const char *dir, size_t dirlen, const char *fname,
-+	       glob_t *pglob, int flags)
- {
-   size_t fnamelen = strlen (fname);
-   char *fullname = (char *) __alloca (dirlen + 1 + fnamelen + 1);
-   struct stat st;
--# ifndef _LIBC
-   struct_stat64 st64;
--# endif
- 
-   mempcpy (mempcpy (mempcpy (fullname, dir, dirlen), "/", 1),
- 	   fname, fnamelen + 1);
- 
--# ifdef _LIBC
--  return (*pglob->gl_stat) (fullname, &st) == 0;
--# else
-   return ((__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)
- 	   ? (*pglob->gl_stat) (fullname, &st)
- 	   : __stat64 (fullname, &st64)) == 0);
--# endif
- }
--# ifdef _LIBC
--#  define link_exists_p(dfd, dirname, dirnamelen, fname, pglob, flags) \
--  (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)			      \
--   ? link_exists2_p (dirname, dirnamelen, fname, pglob)			      \
--   : ({ struct stat64 st64;						      \
--       __fxstatat64 (_STAT_VER, dfd, fname, &st64, 0) == 0; }))
--# else
--#  define link_exists_p(dfd, dirname, dirnamelen, fname, pglob, flags) \
--  link_exists2_p (dirname, dirnamelen, fname, pglob, flags)
--# endif
- #endif
- 
- 
-@@ -1332,10 +1311,6 @@
- 	}
-       else
- 	{
--#ifdef _LIBC
--	  int dfd = (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)
--		     ? -1 : dirfd ((DIR *) stream));
--#endif
- 	  int fnm_flags = ((!(flags & GLOB_PERIOD) ? FNM_PERIOD : 0)
- 			   | ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
- #if defined _AMIGA || defined VMS
-@@ -1394,7 +1369,7 @@
- 		  /* If the file we found is a symlink we have to
- 		     make sure the target file exists.  */
- 		  if (!DIRENT_MIGHT_BE_SYMLINK (d)
--		      || link_exists_p (dfd, directory, dirlen, name, pglob,
-+		      || link_exists_p (directory, dirlen, name, pglob,
- 					flags))
- 		    {
- 		      if (cur == names->count)

Modified: glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-syscalls_2.11.patch
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-syscalls_2.11.patch	2010-02-16 14:59:01 UTC (rev 4201)
+++ glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-syscalls_2.11.patch	2010-02-16 15:30:12 UTC (rev 4202)
@@ -23,13 +23,28 @@
  sys_lio_listio		-	lio_listio		i:ibnP		__syscall_lio_listio
 --- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/Versions
-@@ -87,6 +87,9 @@
+@@ -87,6 +87,11 @@
      kenv;
      sysctlnametomib;
    }
 +  GLIBC_2.11 {
 +    lchflags;
++    #errlist-compat 94
++    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
 +  }
    GLIBC_PRIVATE {
      # needed by libpthread.
      __clone; __libc_fork; __libc_sigaction;
+--- a/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/errno.h
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/errno.h
+@@ -155,8 +155,9 @@
+ #define	EMULTIHOP	90		/* Multihop attempted */
+ #define	ENOLINK		91		/* Link has been severed */
+ #define	EPROTO		92		/* Protocol error */
++#define	ENOTCAPABLE	93		/* Capabilities insufficient */
+ 
+-#define	ELAST		92		/* Must be equal largest errno */
++#define	ELAST		93		/* Must be equal largest errno */
+ 
+ # ifndef __ASSEMBLER__
+ /* Function to get address of global `errno' variable.  */

Modified: glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-sysdeps.diff	2010-02-16 14:59:01 UTC (rev 4201)
+++ glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-sysdeps.diff	2010-02-16 15:30:12 UTC (rev 4202)
@@ -8451,7 +8451,7 @@
 +#endif
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/faccessat.c
-@@ -0,0 +1,172 @@
+@@ -0,0 +1,171 @@
 +/* Test for access to file, relative to open directory.  Linux version.
 +   Copyright (C) 2006 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -8623,10 +8623,9 @@
 +  __set_errno (EACCES);
 +  return -1;
 +}
-+stub_warning(faccessat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fchmodat.c
-@@ -0,0 +1,139 @@
+@@ -0,0 +1,138 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -8765,10 +8764,9 @@
 +    return __chmod(file, mode);
 +#endif
 +}
-+stub_warning(fchmodat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fchownat.c
-@@ -0,0 +1,138 @@
+@@ -0,0 +1,137 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -8906,7 +8904,6 @@
 +    return __chown(file, owner, group);
 +#endif
 +}
-+stub_warning(fchownat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fcntl.c
 @@ -0,0 +1,69 @@
@@ -8981,7 +8978,7 @@
 +weak_alias (__libc_fcntl, fcntl)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fexecve.c
-@@ -0,0 +1,104 @@
+@@ -0,0 +1,103 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -9085,7 +9082,6 @@
 +  return -1;
 +#endif
 +}
-+stub_warning(fexecve)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fhstat.c
 @@ -0,0 +1,40 @@
@@ -9479,7 +9475,7 @@
 +/* 'ftruncate64' is the same as 'ftruncate', because __off64_t == __off_t.  */
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/futimesat.c
-@@ -0,0 +1,139 @@
+@@ -0,0 +1,138 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -9618,7 +9614,6 @@
 +  return __utimes(file, tvp);
 +#endif
 +}
-+stub_warning(futimesat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstat.c
 @@ -0,0 +1,48 @@
@@ -9719,7 +9714,7 @@
 +hidden_def (__fxstat64)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstatat.c
-@@ -0,0 +1,159 @@
+@@ -0,0 +1,158 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -9878,10 +9873,9 @@
 +}
 +
 +libc_hidden_def (__fxstatat)
-+stub_warning(fstatat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstatat64.c
-@@ -0,0 +1,153 @@
+@@ -0,0 +1,152 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -10034,7 +10028,6 @@
 +}
 +
 +libc_hidden_def (__fxstatat64)
-+stub_warning(fstatat64)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getcwd.c
 @@ -0,0 +1,91 @@
@@ -14843,7 +14836,7 @@
 +#endif /* ldsodefs.h */
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/linkat.c
-@@ -0,0 +1,182 @@
+@@ -0,0 +1,181 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -15025,7 +15018,6 @@
 +  return __link (from, to);
 +#endif
 +}
-+stub_warning(linkat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/linuxthreads/Implies
 @@ -0,0 +1 @@
@@ -15771,7 +15763,7 @@
 +hidden_def (__lxstat64)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/mkdirat.c
-@@ -0,0 +1,127 @@
+@@ -0,0 +1,126 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -15898,7 +15890,6 @@
 +  return __mkdir (file, mode);
 +#endif
 +}
-+stub_warning(mkdirat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/mmap.c
 @@ -0,0 +1,86 @@
@@ -18315,7 +18306,7 @@
 +}
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/open.c
-@@ -0,0 +1,89 @@
+@@ -0,0 +1,63 @@
 +/* Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -18367,32 +18358,6 @@
 +    fd = INLINE_SYSCALL (open, 3, file, oflag, mode);
 +    LIBC_CANCEL_RESET (oldtype);
 +  }
-+
-+  if (fd >= 0 && (oflag & O_TRUNC))
-+    {
-+      /* Set the modification time.  The kernel ought to do this.  */
-+      int saved_errno = errno;
-+      struct timeval tv[2];
-+
-+      if (__gettimeofday (&tv[1], NULL) >= 0)
-+	{
-+	  struct stat statbuf;
-+
-+	  if (__fxstat (_STAT_VER, fd, &statbuf) >= 0)
-+	    {
-+	      tv[0].tv_sec = statbuf.st_atime;
-+	      tv[0].tv_usec = 0;
-+
-+#ifdef NOT_IN_libc
-+	      futimes (fd, tv);
-+#else
-+	      __futimes (fd, tv);
-+#endif
-+	    }
-+	}
-+      __set_errno (saved_errno);
-+    }
-+
 +  return fd;
 +}
 +libc_hidden_def (__libc_open)
@@ -18417,7 +18382,7 @@
 +strong_alias (__open_2, __open64_2)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/openat.c
-@@ -0,0 +1,312 @@
+@@ -0,0 +1,189 @@
 +/* Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -18574,136 +18539,15 @@
 +      mode = va_arg (arg, int);
 +      va_end (arg);
 +    }
-+
-+# ifndef __ASSUME_ATFCTS
-+  if (__have_atfcts >= 0)
-+# endif
++  
++  if (SINGLE_THREAD_P)
++    return __openat_nocancel(fd, file, oflag, mode);
++  else
 +    {
-+      if (SINGLE_THREAD_P)
-+	{
-+	  result = INLINE_SYSCALL (openat, 4, fd, file, oflag, mode);
-+	}
-+      else
-+	{
-+	  int oldtype = LIBC_CANCEL_ASYNC ();
-+	  result = INLINE_SYSCALL (openat, 4, fd, file, oflag, mode);
-+	  LIBC_CANCEL_RESET (oldtype);
-+	}
-+# ifndef __ASSUME_ATFCTS
-+      if (result == -1 && errno == ENOSYS)
-+	__have_atfcts = -1;
-+# endif
++      int oldtype = LIBC_CANCEL_ASYNC ();
++      result = __openat_nocancel(fd, file, oflag, mode);
++      LIBC_CANCEL_RESET (oldtype);
 +    }
-+
-+#ifndef __ASSUME_ATFCTS
-+  if (__have_atfcts < 0)
-+    {
-+      if (fd != AT_FDCWD && file[0] != '/')
-+	{
-+	  int mib[4];
-+	  size_t kf_len = 0;
-+	  char *kf_buf, *kf_bufp;
-+	  size_t filelen;
-+
-+	  if (fd < 0)
-+	    {
-+	      __set_errno (EBADF);
-+	      return -1;
-+	    }
-+
-+	  filelen = strlen (file);
-+	  if (__builtin_expect (filelen == 0, 0))
-+	    {
-+	      __set_errno (ENOENT);
-+	      return -1;
-+	    }
-+
-+	  mib[0] = CTL_KERN;
-+	  mib[1] = KERN_PROC;
-+	  mib[2] = KERN_PROC_FILEDESC;
-+	  mib[3] = __getpid ();
-+
-+	  if (__sysctl (mib, 4, NULL, &kf_len, NULL, 0) != 0)
-+	    {
-+	      __set_errno (ENOSYS);
-+	      return -1;
-+	    }
-+
-+	  kf_buf = alloca (kf_len + filelen);
-+	  if (__sysctl (mib, 4, kf_buf, &kf_len, NULL, 0) != 0)
-+	    {
-+	      __set_errno (ENOSYS);
-+	      return -1;
-+	    }
-+
-+	  kf_bufp = kf_buf;
-+	  while (kf_bufp < kf_buf + kf_len)
-+	    {
-+	      struct kinfo_file *kf =
-+		(struct kinfo_file *) (uintptr_t) kf_bufp;
-+
-+	      if (kf->kf_fd == fd)
-+		{
-+		  if (kf->kf_type != KF_TYPE_VNODE ||
-+		      kf->kf_vnode_type != KF_VTYPE_VDIR)
-+		    {
-+		      __set_errno (ENOTDIR);
-+		      return -1;
-+		    }
-+
-+		  strcat (kf->kf_path, "/");
-+		  strcat (kf->kf_path, file);
-+		  file = kf->kf_path;
-+		  break;
-+		}
-+	      kf_bufp += kf->kf_structsize;
-+	    }
-+
-+	  if (kf_bufp >= kf_buf + kf_len)
-+	    {
-+	      __set_errno (EBADF);
-+	      return -1;
-+	    }
-+	}
-+      if (SINGLE_THREAD_P)
-+	{
-+	  result = INLINE_SYSCALL (open, 3, file, oflag, mode);
-+	}
-+      else
-+	{
-+	  int oldtype = LIBC_CANCEL_ASYNC ();
-+	  result = INLINE_SYSCALL (open, 3, file, oflag, mode);
-+	  LIBC_CANCEL_RESET (oldtype);
-+	}
-+
-+    }
-+#endif
-+
-+  if (result >= 0 && (oflag & O_TRUNC))
-+    {
-+      /* Set the modification time.  The kernel ought to do this.  */
-+      int saved_errno = errno;
-+      struct timeval tv[2];
-+
-+      if (__gettimeofday (&tv[1], NULL) >= 0)
-+	{
-+	  struct stat statbuf;
-+
-+	  if (__fxstat (_STAT_VER, result, &statbuf) >= 0)
-+	    {
-+	      tv[0].tv_sec = statbuf.st_atime;
-+	      tv[0].tv_usec = 0;
-+
-+#ifdef NOT_IN_libc
-+	      futimes (fd, tv);
-+#else
-+	      __futimes (fd, tv);
-+#endif
-+	    }
-+	}
-+      __set_errno (saved_errno);
-+    }
-+
 +  return result;
 +}
 +
@@ -18728,8 +18572,6 @@
 +}
 +
 +strong_alias (__openat_2, __openat64_2)
-+stub_warning(openat)
-+stub_warning(openat64)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/openat64.c
 @@ -0,0 +1,2 @@
@@ -18889,6 +18731,10 @@
 @@ -0,0 +1 @@
 +/* 'pread64' is the same as 'pread', because __off64_t == __off_t.  */
 --- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/preadv64.c
+@@ -0,0 +1 @@
++/* 'preadv64' is the same as 'preadv', because __off64_t == __off_t.  */
+--- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/prof-freq.c
 @@ -0,0 +1,47 @@
 +/* Copyright (C) 2002 Free Software Foundation, Inc.
@@ -19121,6 +18967,10 @@
 @@ -0,0 +1 @@
 +/* 'pwrite64' is the same as 'pwrite', because __off64_t == __off_t.  */
 --- /dev/null
++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/pwritev64.c
+@@ -0,0 +1 @@
++/* 'pwritev64' is the same as 'pwritev', because __off64_t == __off_t.  */
+--- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/readdir.c
 @@ -0,0 +1,11 @@
 +/* 'readdir64' is the same as 'readdir', because
@@ -19160,7 +19010,7 @@
 +weak_alias (__readdir64_r, readdir64_r)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/readlinkat.c
-@@ -0,0 +1,131 @@
+@@ -0,0 +1,130 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -19291,7 +19141,6 @@
 +}
 +
 +libc_hidden_def (readlinkat)
-+stub_warning(readlinkat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/readonly-area.c
 @@ -0,0 +1,96 @@
@@ -19540,7 +19389,7 @@
 +libc_hidden_def (remove)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/renameat.c
-@@ -0,0 +1,175 @@
+@@ -0,0 +1,174 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -19715,7 +19564,6 @@
 +  return __rename (old, new);
 +#endif
 +}
-+stub_warning(renameat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/rtld-lowlevel.h
 @@ -0,0 +1,131 @@
@@ -21192,7 +21040,7 @@
 +#include <misc/stty.c>
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/symlinkat.c
-@@ -0,0 +1,127 @@
+@@ -0,0 +1,126 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -21319,7 +21167,6 @@
 +  return __symlink (from, to);
 +#endif
 +}
-+stub_warning(symlinkat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/kd.h
 @@ -0,0 +1,25 @@
@@ -23257,7 +23104,7 @@
 +#endif
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list
-@@ -0,0 +1,183 @@
+@@ -0,0 +1,185 @@
 +# File name		Caller	Syscall name		# args		Strong name	Weak names
 +sys_access		-	access			i:si		__syscall_access
 +acl_aclcheck_fd		-	acl_aclcheck_fd		i:iip		__acl_aclcheck_fd
@@ -23358,6 +23205,8 @@
 +sys_freebsd6_pread	-	freebsd6_pread		i:ibnii		__syscall_freebsd6_pread
 +sys_pwrite		-	pwrite			i:ibni		__syscall_pwrite
 +sys_freebsd6_pwrite	-	freebsd6_pwrite		i:ibnii		__syscall_freebsd6_pwrite
++preadv			-	preadv			Ci:ipii		__preadv  preadv  __preadv64  preadv64 
++pwritev			-	pwritev			Ci:ipii		__pwritev pwritev __pwritev64 pwritev64 
 +quotactl		-	quotactl		i:siip		quotactl
 +sys_readv		-	readv			i:ipi		__syscall_readv
 +rfork			-	rfork			i:i		__rfork rfork
@@ -23496,13 +23345,13 @@
 +      case _SC_NGROUPS_MAX:
 +	request[0] = CTL_KERN;
 +	request[1] = KERN_NGROUPS;
-+	if (sysctl(request, 2, &value, &len, NULL, 0) == -1)
++	if (__sysctl(request, 2, &value, &len, NULL, 0) == -1)
 +	    return NGROUPS_MAX;
 +	return (long)value;
 +      case _SC_ARG_MAX:
 +	request[0] = CTL_KERN;
 +	request[1] = KERN_ARGMAX;
-+	if (sysctl(request, 2, &value, &len, NULL, 0) == -1)
++	if (__sysctl(request, 2, &value, &len, NULL, 0) == -1)
 +	    return ARG_MAX;
 +	return (long)value;
 +    }
@@ -24027,7 +23876,7 @@
 +libc_hidden_def (uname)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/unlinkat.c
-@@ -0,0 +1,136 @@
+@@ -0,0 +1,135 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -24163,7 +24012,6 @@
 +    return __unlink (file);
 +#endif
 +}
-+stub_warning(unlinkat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/unlockpt.c
 @@ -0,0 +1,45 @@
@@ -27597,7 +27445,7 @@
 +weak_alias (__xmknod, _xmknod)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/xmknodat.c
-@@ -0,0 +1,146 @@
+@@ -0,0 +1,145 @@
 +/* Copyright (C) 2009 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -27743,7 +27591,6 @@
 +}
 +
 +libc_hidden_def (__xmknodat)
-+stub_warning(xmknodat)
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/xstat.c
 @@ -0,0 +1,49 @@

Modified: glibc-package/branches/eglibc-2.11/debian/patches/series.kfreebsd-amd64
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/series.kfreebsd-amd64	2010-02-16 14:59:01 UTC (rev 4201)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series.kfreebsd-amd64	2010-02-16 15:30:12 UTC (rev 4202)
@@ -1,5 +1,4 @@
 kfreebsd/local-config_h_in.patch
-kfreebsd/local-ftw.diff
 kfreebsd/local-linuxthreads29.diff
 kfreebsd/local-nosavesse.diff
 kfreebsd/local-memusage_no_mremap.diff

Modified: glibc-package/branches/eglibc-2.11/debian/patches/series.kfreebsd-i386
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/series.kfreebsd-i386	2010-02-16 14:59:01 UTC (rev 4201)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series.kfreebsd-i386	2010-02-16 15:30:12 UTC (rev 4202)
@@ -1,5 +1,4 @@
 kfreebsd/local-config_h_in.patch
-kfreebsd/local-ftw.diff
 kfreebsd/local-linuxthreads29.diff
 kfreebsd/local-nosavesse.diff
 kfreebsd/local-memusage_no_mremap.diff


Reply to: