system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

[microblaze] Remove __ASSUME_FUTIMESAT.

Browse Source 
MicroBlaze has a special version of futimesat.c because it gained the
futimesat syscall later than other non-asm-generic architectures.  Now
the minimum kernel is recent enough that this syscall can always be
assumed to be present for MicroBlaze, so this patch removes the
special version and the __ASSUME_FUTIMESAT macro, resulting in the
sysdeps/unix/sysv/linux/futimesat.c version being used.

Untested.

	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
	(__ASSUME_FUTIMESAT): Remove macro.
	* sysdeps/unix/sysv/linux/microblaze/futimesat.c: Remove file.
This commit is contained in:
Joseph Myers 2016-03-29 22:13:36 +00:00
parent 317b199b4a
commit 258ec8abc1
3 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2016-03-29 Florian Weimer <fweimer@redhat.com>
[BZ #19879] [BZ #19879]

30
sysdeps/unix/sysv/linux/microblaze/futimesat.c
View File

@ -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

3
sysdeps/unix/sysv/linux/microblaze/kernel-features.h
View File

@ -41,9 +41,6 @@
/* Support for the accept4 and recvmmsg syscalls was added in 2.6.33. */ /* Support for the accept4 and recvmmsg syscalls was added in 2.6.33. */
#define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL 1 #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> #include_next <kernel-features.h>
/* Support for the pselect6, preadv and pwritev syscalls was added in /* Support for the pselect6, preadv and pwritev syscalls was added in