summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-05-10 23:10:52 +0000
committerJakub Jelinek <jakub@redhat.com>2007-05-10 23:10:52 +0000
commite169ea9b569d9e9a60bde4aebe960591bacaf4ef (patch)
tree8a14840e4fb4177c94d8e3f51e1b62cac56e6664
parent6bad2cd171c7d81e9a43ccc79e91009438c948ac (diff)
Updated to fedora-glibc-20070510T2308cvs/fedora-glibc-2_5_90-24
-rw-r--r--ChangeLog28
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in5
-rw-r--r--include/sys/cdefs.h6
-rw-r--r--io/Makefile3
-rw-r--r--io/Versions3
-rw-r--r--io/futimens.c36
-rw-r--r--io/sys/stat.h20
-rw-r--r--io/utimensat.c34
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/tst-align2.c1
-rw-r--r--nptl/tst-getpid1.c1
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/stat.h6
-rw-r--r--sysdeps/unix/sysv/linux/bits/stat.h6
-rw-r--r--sysdeps/unix/sysv/linux/futimens.c45
-rw-r--r--sysdeps/unix/sysv/linux/futimes.c63
-rw-r--r--sysdeps/unix/sysv/linux/ia64/bits/stat.h6
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h5
-rw-r--r--sysdeps/unix/sysv/linux/lutimes.c59
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/bits/stat.h6
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/stat.h6
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/stat.h6
-rw-r--r--sysdeps/unix/sysv/linux/utimensat.c50
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/bits/stat.h6
24 files changed, 392 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f28cffa33..6a8b6dd1e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2007-05-10 Ulrich Drepper <drepper@redhat.com>
+
+ * io/sys/stat.h: Make sure struct timespec is defined for
+ __USE_ATFILE.
+
+ * sysdeps/unix/sysv/linux/powerpc/bits/stat.h: Define UTIME_NOW and
+ UTIME_OMIT.
+ * sysdeps/unix/sysv/linux/x86_64/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/ia64/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/s390/bits/stat.h: Likewise.
+ * sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_UTIMENSAT.
+ * io/sys/stat.h: Declare utimensat, futimens.
+ * io/utimensat.c: New file.
+ * io/futimens.c: New file.
+ * sysdeps/unix/sysv/linux/utimensat.c: New file.
+ * sysdeps/unix/sysv/linux/futimens.c: New file.
+ * io/Makefile (routines): Add utimensat, futimens.
+ * io/Versions: Add utimensat, futimens to GLIBC_2.6.
+ * sysdeps/unix/sysv/linux/lutimes.c: New file.
+ * sysdeps/unix/sysv/linux/futimes.c: Use utimensat syscall if
+ available.
+
+ * include/sys/cdefs.h: Redefine __nonnull so that test for
+ incorrect parameters in the libc code itself are not omitted.
+
2006-07-02 Jakub Jelinek <jakub@redhat.com>
* nscd/connections.c (sighup_pending): New variable.
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 1fcd7aba45..b38bb1790c 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
glibc-base := HEAD
DIST_BRANCH := devel
COLLECTION := dist-fc7
-fedora-sync-date := 2007-05-10 06:34 UTC
-fedora-sync-tag := fedora-glibc-20070510T0634
+fedora-sync-date := 2007-05-10 23:08 UTC
+fedora-sync-tag := fedora-glibc-20070510T2308
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 4cb50465b1..d0892135c1 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 23
+%define glibcrelease 24
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define xenarches i686 athlon
%ifarch %{xenarches}
@@ -1561,6 +1561,9 @@ rm -f *.filelist*
%endif
%changelog
+* Fri May 11 2007 Jakub Jelinek <jakub@redhat.com> 2.5.90-24
+- utimensat, futimens and lutimes support
+
* Thu May 10 2007 Jakub Jelinek <jakub@redhat.com> 2.5.90-23
- use madvise MADV_DONTNEED in malloc
- fix ia64 feraiseexcept
diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
index 8ba980477d..cd0750b452 100644
--- a/include/sys/cdefs.h
+++ b/include/sys/cdefs.h
@@ -2,6 +2,12 @@
#include <misc/sys/cdefs.h>
+/* The compiler will optimize based on the knowledge the parameter is
+ not NULL. This will omit tests. A robust implementation cannot allow
+ this so when compiling glibc itself we ignore this attribute. */
+#undef __nonnull
+#define __nonnull(params)
+
extern void __chk_fail (void) __attribute__ ((__noreturn__));
libc_hidden_proto (__chk_fail)
rtld_hidden_proto (__chk_fail)
diff --git a/io/Makefile b/io/Makefile
index 206435de44..81078ae3ec 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -51,7 +51,8 @@ routines := \
ftw ftw64 fts poll ppoll \
posix_fadvise posix_fadvise64 \
posix_fallocate posix_fallocate64 \
- sendfile sendfile64
+ sendfile sendfile64 \
+ utimensat futimens
# These routines will be omitted from the libc shared object.
# Instead the static object files will be included in a special archive
diff --git a/io/Versions b/io/Versions
index bc9c9d2685..9cc515796d 100644
--- a/io/Versions
+++ b/io/Versions
@@ -113,4 +113,7 @@ libc {
ppoll;
}
+ GLIBC_2.6 {
+ utimensat; futimens;
+ }
}
diff --git a/io/futimens.c b/io/futimens.c
new file mode 100644
index 0000000000..1d0fafedac
--- /dev/null
+++ b/io/futimens.c
@@ -0,0 +1,36 @@
+/* Change access and modification times of open file. Linux version.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <time.h>
+#include <sysdep.h>
+
+
+/* Change the access time of the file associated with FD to TSP[0] and
+ the modification time of FILE to TSP[1]. */
+int
+futimens (int fd, const struct timespec tsp[2])
+{
+ __set_errno (ENOSYS);
+ return -1;
+}
+stub_warning (futimens)
+#include <stub-tag.h>
diff --git a/io/sys/stat.h b/io/sys/stat.h
index d1f4484185..15ae35b199 100644
--- a/io/sys/stat.h
+++ b/io/sys/stat.h
@@ -28,11 +28,12 @@
#include <bits/types.h> /* For __mode_t and __dev_t. */
-#if defined __USE_XOPEN || defined __USE_MISC
+#if defined __USE_XOPEN || defined __USE_XOPEN2K || defined __USE_MISC \
+ || defined __USE_ATFILE
# if defined __USE_XOPEN || defined __USE_XOPEN2K
# define __need_time_t
# endif
-# ifdef __USE_MISC
+# if defined __USE_MISC || defined __USE_ATFILE
# define __need_timespec
# endif
# include <time.h> /* For time_t resp. timespec. */
@@ -354,6 +355,21 @@ extern int mkfifoat (int __fd, __const char *__path, __mode_t __mode)
__THROW __nonnull ((2));
#endif
+#ifdef __USE_ATFILE
+/* Set file access and modification times relative to directory file
+ descriptor. */
+extern int utimensat (int __fd, __const char *__path,
+ __const struct timespec __times[2],
+ int __flags)
+ __THROW __nonnull ((2));
+#endif
+
+#ifdef __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+/* Set file access and modification times of the file associated with FD. */
+extern int futimens (int __fd, __const struct timespec __times[2]) __THROW;
+#endif
+
/* To allow the `struct stat' structure and the file type `mode_t'
bits to vary without changing shared library major version number,
the `stat' family of functions and `mknod' are in fact inline
diff --git a/io/utimensat.c b/io/utimensat.c
new file mode 100644
index 0000000000..3b9e7ef792
--- /dev/null
+++ b/io/utimensat.c
@@ -0,0 +1,34 @@
+/* Change access and modification times of open file. Stub version.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <sys/stat.h>
+
+
+/* Change the access time of FILE to TSP[0] and
+ the modification time of FILE to TSP[1]. */
+int
+utimensat (int fd, const char *file, const struct timespec tsp[2],
+ int flags)
+{
+ __set_errno (ENOSYS);
+ return -1;
+}
+stub_warning (utimensat)
+#include <stub-tag.h>
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 6cbb87adeb..662c567c8b 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-10 Jakub Jelinek <jakub@redhat.com>
+
+ [BZ #4455]
+ * tst-align2.c: Include stackinfo.h.
+ * tst-getpid1.c: Likewise.
+
2007-05-02 Carlos O'Donell <carlos@systemhalted.org>
[BZ #4455]
diff --git a/nptl/tst-align2.c b/nptl/tst-align2.c
index 4685c201e4..9c300ecd1f 100644
--- a/nptl/tst-align2.c
+++ b/nptl/tst-align2.c
@@ -24,6 +24,7 @@
#include <sys/wait.h>
#include <unistd.h>
#include <tst-stack-align.h>
+#include <stackinfo.h>
static int
f (void *arg)
diff --git a/nptl/tst-getpid1.c b/nptl/tst-getpid1.c
index e15cb61151..253ebf2e15 100644
--- a/nptl/tst-getpid1.c
+++ b/nptl/tst-getpid1.c
@@ -5,6 +5,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <stackinfo.h>
#ifndef TEST_CLONE_FLAGS
#define TEST_CLONE_FLAGS 0
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/stat.h b/sysdeps/unix/sysv/linux/alpha/bits/stat.h
index 40b6853430..42748be762 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/stat.h
@@ -149,3 +149,9 @@ struct stat64
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
diff --git a/sysdeps/unix/sysv/linux/bits/stat.h b/sysdeps/unix/sysv/linux/bits/stat.h
index e08899c9a4..cc665f377e 100644
--- a/sysdeps/unix/sysv/linux/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/bits/stat.h
@@ -161,3 +161,9 @@ struct stat64
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
diff --git a/sysdeps/unix/sysv/linux/futimens.c b/sysdeps/unix/sysv/linux/futimens.c
new file mode 100644
index 0000000000..67f2588f86
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/futimens.c
@@ -0,0 +1,45 @@
+/* Change access and modification times of open file. Linux version.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <time.h>
+#include <sysdep.h>
+
+
+/* Change the access time of the file associated with FD to TSP[0] and
+ the modification time of FILE to TSP[1].
+
+ Starting with 2.6.22 the Linux kernel has the utimensat syscall which
+ can be used to implement futimens. */
+int
+futimens (int fd, const struct timespec tsp[2])
+{
+#ifdef __NR_utimensat
+ return INLINE_SYSCALL (utimensat, 4, fd, NULL, tsp, 0);
+#else
+ __set_errno (ENOSYS);
+ return -1;
+#endif
+}
+#ifndef __NR_utimensat
+stub_warning (futimens)
+# include <stub-tag.h>
+#endif
diff --git a/sysdeps/unix/sysv/linux/futimes.c b/sysdeps/unix/sysv/linux/futimes.c
index b307c3ff64..610f1deb29 100644
--- a/sysdeps/unix/sysv/linux/futimes.c
+++ b/sysdeps/unix/sysv/linux/futimes.c
@@ -20,6 +20,7 @@
#include <errno.h>
#include <sysdep.h>
#include <string.h>
+#include <time.h>
#include <utime.h>
#include <sys/time.h>
#include <stdio-common/_itoa.h>
@@ -27,32 +28,67 @@
#include <kernel-features.h>
-/* Change the access time of FILE to TVP[0] and
- the modification time of FILE to TVP[1], but do not follow symlinks.
- The Linux kernel has no futimes() syscall so we use the /proc
- filesystem. */
+#ifndef __ASSUME_UTIMENSAT
+static int miss_utimensat;
+#endif
+
+/* Change the access time of the file associated with FD to TVP[0] and
+ the modification time of FILE to TVP[1].
+
+ Starting with 2.6.22 the Linux kernel has the utimensat syscall which
+ can be used to implement futimes. Earlier kernels have no futimes()
+ syscall so we use the /proc filesystem. */
int
__futimes (int fd, const struct timeval tvp[2])
{
+ /* The utimensat system call expects timespec not timeval. */
+ struct timespec ts[2];
+ if (tvp != NULL)
+ {
+ if (tvp[0].tv_usec < 0 || tvp[0].tv_usec >= 1000000
+ || tvp[1].tv_usec < 0 || tvp[1].tv_usec >= 1000000)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+
+ TIMEVAL_TO_TIMESPEC (&tvp[0], &ts[0]);
+ TIMEVAL_TO_TIMESPEC (&tvp[1], &ts[1]);
+ }
+
+#ifdef __ASSUME_UTIMENSAT
+ return INLINE_SYSCALL (utimensat, 4, fd, NULL, tvp ? &ts : NULL, 0);
+#else
+ int result;
+# ifdef __NR_utimensat
+ if (!__builtin_expect (miss_utimensat, 0))
+ {
+ result = INLINE_SYSCALL (utimensat, 4, fd, NULL, tvp ? &ts : NULL, 0);
+ if (__builtin_expect (result, 0) != -1 || errno != ENOSYS)
+ return result;
+
+ miss_utimensat = 1;
+ }
+# endif
+
static const char selffd[] = "/proc/self/fd/";
char fname[sizeof (selffd) + 3 * sizeof (int)];
fname[sizeof (fname) - 1] = '\0';
char *cp = _itoa_word ((unsigned int) fd, fname + sizeof (fname) - 1, 10, 0);
cp = memcpy (cp - sizeof (selffd) + 1, selffd, sizeof (selffd) - 1);
- int result;
-#ifdef __NR_utimes
+# ifdef __NR_utimes
result = INLINE_SYSCALL (utimes, 2, cp, tvp);
-# ifndef __ASSUME_UTIMES
+# ifndef __ASSUME_UTIMES
if (result == -1 && errno == ENOSYS)
+# endif
# endif
-#endif
{
/* The utimes() syscall does not exist or is not available in the
used kernel. Use utime(). For this we have to convert to the
data format utime() expects. */
-#ifndef __ASSUME_UTIMES
+# ifndef __ASSUME_UTIMES
struct utimbuf buf;
struct utimbuf *times;
@@ -66,7 +102,7 @@ __futimes (int fd, const struct timeval tvp[2])
times = NULL;
result = INLINE_SYSCALL (utime, 2, cp, times);
-#endif
+# endif
}
if (result == -1)
@@ -88,14 +124,15 @@ __futimes (int fd, const struct timeval tvp[2])
case ENOENT:
/* Validate the file descriptor by letting fcntl set errno to
EBADF if it's bogus. Otherwise it's a /proc issue. */
-#if !defined __NR_fcntl && defined __NR_fcntl64
-# define __NR_fcntl __NR_fcntl64
-#endif
+# if !defined __NR_fcntl && defined __NR_fcntl64
+# define __NR_fcntl __NR_fcntl64
+# endif
if (INLINE_SYSCALL (fcntl, 3, fd, F_GETFD, 0) != -1)
__set_errno (ENOSYS);
break;
}
return result;
+#endif
}
weak_alias (__futimes, futimes)
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/stat.h b/sysdeps/unix/sysv/linux/ia64/bits/stat.h
index f6b6671c0e..1988c492b0 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/stat.h
@@ -138,3 +138,9 @@ struct stat64
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index e54f675dbe..ed32001544 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -458,3 +458,8 @@
#if __LINUX_KERNEL_VERSION >= 0x020612
# define __ASSUME_FUTEX_LOCK_PI 1
#endif
+
+/* Support for utimensat syscall was added in 2.6.22. */
+#if __LINUX_KERNEL_VERSION >= 0x020616
+# define __ASSUME_UTIMENSAT 1
+#endif
diff --git a/sysdeps/unix/sysv/linux/lutimes.c b/sysdeps/unix/sysv/linux/lutimes.c
new file mode 100644
index 0000000000..7ea91c336a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/lutimes.c
@@ -0,0 +1,59 @@
+/* Change access and/or modification date of file. Do not follow symbolic
+ links.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sysdep.h>
+#include <kernel-features.h>
+
+
+int
+lutimes (const char *file, const struct timeval tvp[2])
+{
+#ifdef __NR_utimensat
+ /* The system call espects timespec, not timeval. */
+ struct timespec ts[2];
+ if (tvp != NULL)
+ {
+ if (tvp[0].tv_usec < 0 || tvp[0].tv_usec >= 1000000
+ || tvp[1].tv_usec < 0 || tvp[1].tv_usec >= 1000000)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+
+ TIMEVAL_TO_TIMESPEC (&tvp[0], &ts[0]);
+ TIMEVAL_TO_TIMESPEC (&tvp[1], &ts[1]);
+ }
+
+ return INLINE_SYSCALL (utimensat, 4, AT_FDCWD, file, tvp ? ts : NULL,
+ AT_SYMLINK_NOFOLLOW);
+#else
+ __set_errno (ENOSYS);
+ return -1;
+#endif
+}
+
+#ifndef __NR_utimensat
+stub_warning (lutimes)
+# include <stub-tag.h>
+#endif
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/stat.h b/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
index b020504d0b..53457ef1fa 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
@@ -265,3 +265,9 @@ struct stat64
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
diff --git a/sysdeps/unix/sysv/linux/s390/bits/stat.h b/sysdeps/unix/sysv/linux/s390/bits/stat.h
index c8ff532d49..00fcf078ba 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/stat.h
@@ -254,3 +254,9 @@ struct stat64
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/stat.h b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
index 2fccb14cf9..17c912a70f 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
@@ -163,3 +163,9 @@ struct stat64
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif
diff --git a/sysdeps/unix/sysv/linux/utimensat.c b/sysdeps/unix/sysv/linux/utimensat.c
new file mode 100644
index 0000000000..f9b60a0d35
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/utimensat.c
@@ -0,0 +1,50 @@
+/* Change access and modification times of open file. Linux version.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <sys/stat.h>
+#include <sysdep.h>
+
+#include <kernel-features.h>
+
+
+/* Change the access time of FILE to TSP[0] and
+ the modification time of FILE to TSP[1].
+
+ Starting with 2.6.22 the Linux kernel has the utimensat syscall. */
+int
+utimensat (int fd, const char *file, const struct timespec tsp[2],
+ int flags)
+{
+ if (file == NULL)
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+#ifdef __NR_utimensat
+ return INLINE_SYSCALL (utimensat, 4, fd, file, tsp, flags);
+#else
+ __set_errno (ENOSYS);
+ return -1;
+#endif
+}
+#ifndef __NR_utimensat
+stub_warning (utimensat)
+# include <stub-tag.h>
+#endif
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/stat.h b/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
index e756d7e8ca..add2c8eca3 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/x86_64/bits/stat.h
@@ -201,3 +201,9 @@ struct stat64
#define __S_IREAD 0400 /* Read by owner. */
#define __S_IWRITE 0200 /* Write by owner. */
#define __S_IEXEC 0100 /* Execute by owner. */
+
+#if defined __USE_ATFILE || defined __USE_GNU
+/* XXX This will change to the macro for the next 2008 POSIX revision. */
+# define UTIME_NOW ((1l << 30) - 1l)
+# define UTIME_OMIT ((1l << 30) - 2l)
+#endif