1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00

Use XSTAT_IS_XSTAT64 in generic xstat functions

* sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c: Do not define
	fxstat if XSTAT_IS_XSTAT64 is set to non-zero.
	* sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c: Ditto for
	fxstatat.
	* sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c: Ditto for
	lxstat.
	* sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c: Ditto for xstat.

	* sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c: New file.
	* sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c: New file.
	* sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c: Make __lxstat
	an alias of __lxstat64 if XSTAT_IS_XSTAT64 is set to non-zero.
	* sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c: Ditto for
	__xstat.
This commit is contained in:
Steve Ellcey
2016-11-29 08:06:47 -08:00
parent b365289364
commit a09411756f
9 changed files with 124 additions and 0 deletions

View File

@ -1,3 +1,20 @@
2016-11-29 Yury Norov <ynorov@caviumnetworks.com>
Steve Ellcey <sellcey@caviumnetworks.com>
* sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat.c: Do not define
fxstat if XSTAT_IS_XSTAT64 is set to non-zero.
* sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat.c: Ditto for
fxstatat.
* sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat.c: Ditto for
lxstat.
* sysdeps/unix/sysv/linux/generic/wordsize-32/xstat.c: Ditto for xstat.
* sysdeps/unix/sysv/linux/generic/wordsize-32/fxstat64.c: New file.
* sysdeps/unix/sysv/linux/generic/wordsize-32/fxstatat64.c: New file.
* sysdeps/unix/sysv/linux/generic/wordsize-32/lxstat64.c: Make __lxstat
an alias of __lxstat64 if XSTAT_IS_XSTAT64 is set to non-zero.
* sysdeps/unix/sysv/linux/generic/wordsize-32/xstat64.c: Ditto for
__xstat.
2016-11-29 Florian Weimer <fweimer@redhat.com>
* sysdeps/powerpc/powerpc64/setjmp-common.S (__GI___sigsetjmp):

View File

@ -25,6 +25,7 @@
#include <sysdep.h>
#include <sys/syscall.h>
#if !XSTAT_IS_XSTAT64
#include "overflow.h"
/* Get information about the file FD in BUF. */
@ -43,3 +44,4 @@ __fxstat (int vers, int fd, struct stat *buf)
hidden_def (__fxstat)
weak_alias (__fxstat, _fxstat);
#endif

View File

@ -0,0 +1,36 @@
/* __fxstat64 () implementation.
Copyright (C) 2016 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
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/>. */
/* Hide the prototypes for __fxstat and _fxstat so that GCC will not
complain about the different function signatures if they are aliased
to __fxstat64. If XSTAT_IS_XSTAT64 is set to non-zero then the stat and
stat64 structures have an identical layout but different type names. */
#define __fxstat __fxstat_disable
#define _fxstat _fxstat_disable
#include <sysdeps/unix/sysv/linux/fxstat64.c>
#undef __fxstat
#undef _fxstat
#if XSTAT_IS_XSTAT64
weak_alias (__fxstat64, __fxstat)
weak_alias (__fxstat64, _fxstat)
hidden_ver (__fxstat64, __fxstat)
#endif

View File

@ -26,6 +26,7 @@
#include <sysdep.h>
#include <sys/syscall.h>
#if !XSTAT_IS_XSTAT64
#include "overflow.h"
/* Get information about the file NAME in BUF. */
@ -42,3 +43,4 @@ __fxstatat (int vers, int fd, const char *file, struct stat *buf, int flag)
return -1;
}
libc_hidden_def (__fxstatat)
#endif

View File

@ -0,0 +1,37 @@
/* __fxstatat64 () implementation.
Copyright (C) 2016 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
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/>. */
/* Hide the prototype for __fxstatat so that GCC will not complain about
the different function signature if it is aliased to __fxstatat64.
If XSTAT_IS_XSTAT64 is set to non-zero then the stat and stat64 structures
have an identical layout but different type names. */
#define __fxstatat __fxstatat_disable
#include <sys/stat.h>
#undef _STAT_VER_LINUX
#define _STAT_VER_LINUX _STAT_VER_KERNEL
#include <sysdeps/unix/sysv/linux/fxstatat64.c>
#undef __fxstatat
#if XSTAT_IS_XSTAT64
weak_alias (__fxstatat64, __fxstatat)
libc_hidden_ver (__fxstatat64, __fxstatat)
#endif

View File

@ -25,6 +25,7 @@
#include <sysdep.h>
#include <sys/syscall.h>
#if !XSTAT_IS_XSTAT64
#include "overflow.h"
/* Get information about the file NAME in BUF. */
@ -41,3 +42,4 @@ __lxstat (int vers, const char *name, struct stat *buf)
return -1;
}
hidden_def (__lxstat)
#endif

View File

@ -16,6 +16,13 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
/* Hide the prototype for __lxstat so that GCC will not complain about
the different function signature if it is aliased to __lxstat64.
If XSTAT_IS_XSTAT64 is set to non-zero then the stat and stat64
structures have an identical layout but different type names. */
#define __lxstat __lxstat_disable
#include <errno.h>
#include <stddef.h>
#include <fcntl.h>
@ -36,3 +43,9 @@ __lxstat64 (int vers, const char *name, struct stat64 *buf)
return -1;
}
hidden_def (__lxstat64)
#undef __lxstat
#if XSTAT_IS_XSTAT64
strong_alias (__lxstat64, __lxstat)
hidden_ver (__lxstat64, __lxstat)
#endif

View File

@ -25,6 +25,7 @@
#include <sysdep.h>
#include <sys/syscall.h>
#if !XSTAT_IS_XSTAT64
#include "overflow.h"
/* Get information about the file NAME in BUF. */
@ -41,3 +42,4 @@ __xstat (int vers, const char *name, struct stat *buf)
return -1;
}
hidden_def (__xstat)
#endif

View File

@ -16,6 +16,13 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
/* Hide the prototype for __xstat so that GCC will not complain about
the different function signature if it is aliased to __xstat64.
If XSTAT_IS_XSTAT64 is set to non-zero then the stat and stat64
structures have an identical layout but different type names. */
#define __xstat __xstat_disable
#include <errno.h>
#include <stddef.h>
#include <fcntl.h>
@ -36,3 +43,9 @@ __xstat64 (int vers, const char *name, struct stat64 *buf)
return -1;
}
hidden_def (__xstat64)
#undef __xstat
#if XSTAT_IS_XSTAT64
strong_alias (__xstat64, __xstat)
hidden_ver (__xstat64, __xstat)
#endif