Commit af93807e authored by Zhangjin Wu's avatar Zhangjin Wu Committed by Willy Tarreau
Browse files

tools/nolibc: remove the old sys_stat support 

The statx manpage [1] shows that it has been supported from Linux 4.11
and glibc 2.28, the Linux support can be checked for all of the
architectures with this command:

    $ git grep -r statx v4.11 arch/ include/uapi/asm-generic/unistd.h \
      | grep -E "aarch64|arm|mips|s390|x86|:include/uapi"

Besides riscv and loongarch, all of the nolibc supported architectures
have added sys_statx from Linux v4.11. riscv is mainlined to v4.15,
loongarch is mainlined to v5.19, both of them use the generic unistd.h,
so, they have added sys_statx from their first mainline versions.

The current oldest stable branch is v4.14, only reserving sys_statx
still preserves compatibility with all of the supported stable branches,
So, let's remove the old arch related and dependent sys_stat support
completely.

This is friendly to the future new architecture porting.

[1]: https://man7.org/linux/man-pages/man2/statx.2.html



Signed-off-by: default avatarZhangjin Wu <falcon@tinylab.org>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent bff60150

tools/include/nolibc/arch-aarch64.h

+0 −28
Original line number Diff line number Diff line
@@ -9,34 +9,6 @@ 


#include "compiler.h"



/* The struct returned by the newfstatat() syscall. Differs slightly from the

 * x86_64's stat one by field ordering, so be careful.

 */

struct sys_stat_struct {

	unsigned long   st_dev;

	unsigned long   st_ino;

	unsigned int    st_mode;

	unsigned int    st_nlink;

	unsigned int    st_uid;

	unsigned int    st_gid;



	unsigned long   st_rdev;

	unsigned long   __pad1;

	long            st_size;

	int             st_blksize;

	int             __pad2;



	long            st_blocks;

	long            st_atime;

	unsigned long   st_atime_nsec;

	long            st_mtime;



	unsigned long   st_mtime_nsec;

	long            st_ctime;

	unsigned long   st_ctime_nsec;

	unsigned int    __unused[2];

};



/* Syscalls for AARCH64 :

 *   - registers are 64-bit

 *   - stack is 16-byte aligned

tools/include/nolibc/arch-arm.h

+0 −37
Original line number Diff line number Diff line
@@ -9,43 +9,6 @@ 


#include "compiler.h"



/* The struct returned by the stat() syscall, 32-bit only, the syscall returns

 * exactly 56 bytes (stops before the unused array). In big endian, the format

 * differs as devices are returned as short only.

 */

struct sys_stat_struct {

#if defined(__ARMEB__)

	unsigned short st_dev;

	unsigned short __pad1;

#else

	unsigned long  st_dev;

#endif

	unsigned long  st_ino;

	unsigned short st_mode;

	unsigned short st_nlink;

	unsigned short st_uid;

	unsigned short st_gid;



#if defined(__ARMEB__)

	unsigned short st_rdev;

	unsigned short __pad2;

#else

	unsigned long  st_rdev;

#endif

	unsigned long  st_size;

	unsigned long  st_blksize;

	unsigned long  st_blocks;



	unsigned long  st_atime;

	unsigned long  st_atime_nsec;

	unsigned long  st_mtime;

	unsigned long  st_mtime_nsec;



	unsigned long  st_ctime;

	unsigned long  st_ctime_nsec;

	unsigned long  __unused[2];

};



/* Syscalls for ARM in ARM or Thumb modes :

 *   - registers are 32-bit

 *   - stack is 8-byte aligned

tools/include/nolibc/arch-i386.h

+0 −26
Original line number Diff line number Diff line
@@ -9,32 +9,6 @@ 


#include "compiler.h"



/* The struct returned by the stat() syscall, 32-bit only, the syscall returns

 * exactly 56 bytes (stops before the unused array).

 */

struct sys_stat_struct {

	unsigned long  st_dev;

	unsigned long  st_ino;

	unsigned short st_mode;

	unsigned short st_nlink;

	unsigned short st_uid;

	unsigned short st_gid;



	unsigned long  st_rdev;

	unsigned long  st_size;

	unsigned long  st_blksize;

	unsigned long  st_blocks;



	unsigned long  st_atime;

	unsigned long  st_atime_nsec;

	unsigned long  st_mtime;

	unsigned long  st_mtime_nsec;



	unsigned long  st_ctime;

	unsigned long  st_ctime_nsec;

	unsigned long  __unused[2];

};



/* Syscalls for i386 :

 *   - mostly similar to x86_64

 *   - registers are 32-bit

tools/include/nolibc/arch-mips.h

+0 −28
Original line number Diff line number Diff line
@@ -9,34 +9,6 @@ 


#include "compiler.h"



/* The struct returned by the stat() syscall. 88 bytes are returned by the

 * syscall.

 */

struct sys_stat_struct {

	unsigned int  st_dev;

	long          st_pad1[3];

	unsigned long st_ino;

	unsigned int  st_mode;

	unsigned int  st_nlink;

	unsigned int  st_uid;

	unsigned int  st_gid;

	unsigned int  st_rdev;

	long          st_pad2[2];

	long          st_size;

	long          st_pad3;



	long          st_atime;

	long          st_atime_nsec;

	long          st_mtime;

	long          st_mtime_nsec;



	long          st_ctime;

	long          st_ctime_nsec;

	long          st_blksize;

	long          st_blocks;

	long          st_pad4[14];

};



/* Syscalls for MIPS ABI O32 :

 *   - WARNING! there's always a delayed slot!

 *   - WARNING again, the syntax is different, registers take a '$' and numbers

tools/include/nolibc/arch-riscv.h

+0 −23
Original line number Diff line number Diff line
@@ -9,29 +9,6 @@ 


#include "compiler.h"



struct sys_stat_struct {

	unsigned long	st_dev;		/* Device.  */

	unsigned long	st_ino;		/* File serial number.  */

	unsigned int	st_mode;	/* File mode.  */

	unsigned int	st_nlink;	/* Link count.  */

	unsigned int	st_uid;		/* User ID of the file's owner.  */

	unsigned int	st_gid;		/* Group ID of the file's group. */

	unsigned long	st_rdev;	/* Device number, if device.  */

	unsigned long	__pad1;

	long		st_size;	/* Size of file, in bytes.  */

	int		st_blksize;	/* Optimal block size for I/O.  */

	int		__pad2;

	long		st_blocks;	/* Number 512-byte blocks allocated. */

	long		st_atime;	/* Time of last access.  */

	unsigned long	st_atime_nsec;

	long		st_mtime;	/* Time of last modification.  */

	unsigned long	st_mtime_nsec;

	long		st_ctime;	/* Time of last status change.  */

	unsigned long	st_ctime_nsec;

	unsigned int	__unused4;

	unsigned int	__unused5;

};



#if   __riscv_xlen == 64

#define PTRLOG "3"

#define SZREG  "8"