r4240 - in glibc-package/branches/eglibc-2.11/debian: . patches patches/kfreebsd
Author: schizo
Date: 2010-04-11 18:18:11 +0000 (Sun, 11 Apr 2010)
New Revision: 4240
Added:
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-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:
kfreebsd/local-sysdeps.diff: update to revision 2994
re-enable kfreebsd/local-ftw.diff
Modified: glibc-package/branches/eglibc-2.11/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/changelog 2010-04-11 18:12:28 UTC (rev 4239)
+++ glibc-package/branches/eglibc-2.11/debian/changelog 2010-04-11 18:18:11 UTC (rev 4240)
@@ -116,10 +116,7 @@
* Fix lang_ab field in es_CR locales. Closes: #571755.
[ 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.
+ * kfreebsd/local-sysdeps.diff: update to revision 2994 (from glibc-bsd).
-- Aurelien Jarno <aurel32@debian.org> Sun, 28 Feb 2010 11:27:56 +0100
Added: glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-ftw.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-ftw.diff (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-ftw.diff 2010-04-11 18:18:11 UTC (rev 4240)
@@ -0,0 +1,124 @@
+
+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-sysdeps.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-sysdeps.diff 2010-04-11 18:12:28 UTC (rev 4239)
+++ glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-sysdeps.diff 2010-04-11 18:18:11 UTC (rev 4240)
@@ -8451,7 +8451,7 @@
+#endif
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/faccessat.c
-@@ -0,0 +1,171 @@
+@@ -0,0 +1,172 @@
+/* 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,9 +8623,10 @@
+ __set_errno (EACCES);
+ return -1;
+}
++stub_warning(faccessat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fchmodat.c
-@@ -0,0 +1,138 @@
+@@ -0,0 +1,139 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -8764,9 +8765,10 @@
+ return __chmod(file, mode);
+#endif
+}
++stub_warning(fchmodat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fchownat.c
-@@ -0,0 +1,137 @@
+@@ -0,0 +1,138 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -8904,6 +8906,7 @@
+ 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 @@
@@ -8978,7 +8981,7 @@
+weak_alias (__libc_fcntl, fcntl)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fexecve.c
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,104 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -9082,6 +9085,7 @@
+ return -1;
+#endif
+}
++stub_warning(fexecve)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fhstat.c
@@ -0,0 +1,40 @@
@@ -9475,7 +9479,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,138 @@
+@@ -0,0 +1,139 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -9614,6 +9618,7 @@
+ return __utimes(file, tvp);
+#endif
+}
++stub_warning(futimesat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstat.c
@@ -0,0 +1,48 @@
@@ -9714,7 +9719,7 @@
+hidden_def (__fxstat64)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstatat.c
-@@ -0,0 +1,158 @@
+@@ -0,0 +1,159 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -9873,9 +9878,10 @@
+}
+
+libc_hidden_def (__fxstatat)
++stub_warning(fstatat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/fxstatat64.c
-@@ -0,0 +1,152 @@
+@@ -0,0 +1,153 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -10028,6 +10034,7 @@
+}
+
+libc_hidden_def (__fxstatat64)
++stub_warning(fstatat64)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getcwd.c
@@ -0,0 +1,91 @@
@@ -14836,7 +14843,7 @@
+#endif /* ldsodefs.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/linkat.c
-@@ -0,0 +1,181 @@
+@@ -0,0 +1,182 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -15018,6 +15025,7 @@
+ return __link (from, to);
+#endif
+}
++stub_warning(linkat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/linuxthreads/Implies
@@ -0,0 +1 @@
@@ -15763,7 +15771,7 @@
+hidden_def (__lxstat64)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/mkdirat.c
-@@ -0,0 +1,126 @@
+@@ -0,0 +1,127 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -15890,6 +15898,7 @@
+ return __mkdir (file, mode);
+#endif
+}
++stub_warning(mkdirat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/mmap.c
@@ -0,0 +1,86 @@
@@ -18382,7 +18391,7 @@
+strong_alias (__open_2, __open64_2)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/openat.c
-@@ -0,0 +1,189 @@
+@@ -0,0 +1,191 @@
+/* Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -18572,6 +18581,8 @@
+}
+
+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 @@
@@ -19010,7 +19021,7 @@
+weak_alias (__readdir64_r, readdir64_r)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/readlinkat.c
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,131 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -19141,6 +19152,7 @@
+}
+
+libc_hidden_def (readlinkat)
++stub_warning(readlinkat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/readonly-area.c
@@ -0,0 +1,96 @@
@@ -19389,7 +19401,7 @@
+libc_hidden_def (remove)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/renameat.c
-@@ -0,0 +1,174 @@
+@@ -0,0 +1,175 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -19564,6 +19576,7 @@
+ 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 @@
@@ -21040,7 +21053,7 @@
+#include <misc/stty.c>
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/symlinkat.c
-@@ -0,0 +1,126 @@
+@@ -0,0 +1,127 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -21167,6 +21180,7 @@
+ 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 @@
@@ -23876,7 +23890,7 @@
+libc_hidden_def (uname)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/unlinkat.c
-@@ -0,0 +1,135 @@
+@@ -0,0 +1,136 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -24012,6 +24026,7 @@
+ return __unlink (file);
+#endif
+}
++stub_warning(unlinkat)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/unlockpt.c
@@ -0,0 +1,45 @@
@@ -27445,7 +27460,7 @@
+weak_alias (__xmknod, _xmknod)
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/xmknodat.c
-@@ -0,0 +1,145 @@
+@@ -0,0 +1,146 @@
+/* Copyright (C) 2009 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -27591,6 +27606,7 @@
+}
+
+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-04-11 18:12:28 UTC (rev 4239)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series.kfreebsd-amd64 2010-04-11 18:18:11 UTC (rev 4240)
@@ -1,4 +1,5 @@
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-04-11 18:12:28 UTC (rev 4239)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series.kfreebsd-i386 2010-04-11 18:18:11 UTC (rev 4240)
@@ -1,4 +1,5 @@
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: