about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/futimesat.c30
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/kernel-features.h3
3 files changed, 6 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index b620bbfcfa..82632725a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-29  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+	(__ASSUME_FUTIMESAT): Remove macro.
+	* sysdeps/unix/sysv/linux/microblaze/futimesat.c: Remove file.
+
 2016-03-29  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #19879]
diff --git a/sysdeps/unix/sysv/linux/microblaze/futimesat.c b/sysdeps/unix/sysv/linux/microblaze/futimesat.c
deleted file mode 100644
index 9ce61900bd..0000000000
--- a/sysdeps/unix/sysv/linux/microblaze/futimesat.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Implement futimesat for MicroBlaze.
-   Copyright (C) 2014-2016 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, see
-   <http://www.gnu.org/licenses/>.  */
-
-/* MicroBlaze always had the utimensat syscall but gained the
-   futimesat syscall later, so use the linux-generic implementation of
-   futimesat in terms of the utimensat syscall unless the futimesat
-   syscall is known to be available.  */
-
-#include <kernel-features.h>
-
-#ifdef __ASSUME_FUTIMESAT
-# include <sysdeps/unix/sysv/linux/futimesat.c>
-#else
-# include <sysdeps/unix/sysv/linux/generic/futimesat.c>
-#endif
diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
index 3938989f88..a331b9f3fa 100644
--- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
@@ -41,9 +41,6 @@
 /* Support for the accept4 and recvmmsg syscalls was added in 2.6.33.  */
 #define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL      1
 
-/* Support for the futimesat syscall was added in 2.6.33.  */
-#define __ASSUME_FUTIMESAT              1
-
 #include_next <kernel-features.h>
 
 /* Support for the pselect6, preadv and pwritev syscalls was added in