[git commit] libc/sysdeps: Add new interfaces for new architectures

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Wed Feb 20 12:45:10 UTC 2013


commit: http://git.uclibc.org/uClibc/commit/?id=6a69d7fc632129310b76dd373379261420fadebf
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Signed-off-by: Markos Chandras <markos.chandras at imgtec.com>

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/sysdeps/linux/README                          |    5 +-
 .../sysdeps/linux/common-generic/bits/align64bit.h |   17 ++
 libc/sysdeps/linux/common-generic/bits/dirent.h    |   53 ++++++
 .../linux/common-generic/bits/kernel_stat.h        |   20 ++
 libc/sysdeps/linux/common-generic/bits/stat.h      |  195 ++++++++++++++++++++
 libc/sysdeps/linux/common-generic/bits/statfs.h    |   78 ++++++++
 6 files changed, 367 insertions(+), 1 deletions(-)

diff --git a/libc/sysdeps/linux/README b/libc/sysdeps/linux/README
index 76944f9..d18bf8c 100644
--- a/libc/sysdeps/linux/README
+++ b/libc/sysdeps/linux/README
@@ -4,4 +4,7 @@ port uClibc to some new Linux architecture (arm, mips, etc), this is the place
 to add that support.
 
 All stuff that is not at all dependent on a particular Linux architecture
-goes in the 'common' directory.
+goes in the 'common' directory. However, for new architectures which are
+using the generic syscalls in the Linux Kernel, the 'common-generic'
+directory should be used instead as they all use identical interfaces for
+the system calls.
diff --git a/libc/sysdeps/linux/common-generic/bits/align64bit.h b/libc/sysdeps/linux/common-generic/bits/align64bit.h
new file mode 100644
index 0000000..ece566a
--- /dev/null
+++ b/libc/sysdeps/linux/common-generic/bits/align64bit.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
+#ifndef _ALIGN_64_BIT_H
+#define _ALIGN_64_BIT_H
+
+/* Simple macro for getting the 64-bit struct arch alignment */
+
+struct __longlong_aligned { long long x; };
+
+#define __ARCH_64BIT_ALIGNMENT__ \
+	__attribute__((aligned(__alignof__(struct __longlong_aligned))))
+
+#endif /* bits/align64bit.h */
diff --git a/libc/sysdeps/linux/common-generic/bits/dirent.h b/libc/sysdeps/linux/common-generic/bits/dirent.h
new file mode 100644
index 0000000..74edd30
--- /dev/null
+++ b/libc/sysdeps/linux/common-generic/bits/dirent.h
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
+#ifndef _DIRENT_H
+# error "Never use <bits/dirent.h> directly; include <dirent.h> instead."
+#endif
+
+#include <bits/align64bit.h>
+#include <endian.h>
+
+struct dirent
+  {
+#ifndef __USE_FILE_OFFSET64
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+    __U32_TYPE d_ino;
+    __U32_TYPE __pad1;
+    __S32_TYPE d_off;
+    __S32_TYPE __pad2;
+# else
+    __U32_TYPE __pad1;
+    __U32_TYPE d_ino;
+    __S32_TYPE __pad2;
+    __S32_TYPE d_off;
+# endif /* __LITTLE_ENDIAN */
+#else
+    __U64_TYPE d_ino;
+    __S64_TYPE d_off;
+#endif
+    unsigned short int d_reclen;
+    unsigned char d_type;
+    char d_name[256];		/* We must not include limits.h! */
+  } __ARCH_64BIT_ALIGNMENT__;
+
+#ifdef __USE_LARGEFILE64
+struct dirent64
+  {
+    __U64_TYPE d_ino;
+    __S64_TYPE d_off;
+    unsigned short int d_reclen;
+    unsigned char d_type;
+    char d_name[256];		/* We must not include limits.h! */
+  };
+#endif
+
+#define d_fileno	d_ino	/* Backwards compatibility.  */
+
+#undef  _DIRENT_HAVE_D_NAMLEN
+#define _DIRENT_HAVE_D_RECLEN
+#define _DIRENT_HAVE_D_OFF
+#define _DIRENT_HAVE_D_TYPE
diff --git a/libc/sysdeps/linux/common-generic/bits/kernel_stat.h b/libc/sysdeps/linux/common-generic/bits/kernel_stat.h
new file mode 100644
index 0000000..a6f1d6c
--- /dev/null
+++ b/libc/sysdeps/linux/common-generic/bits/kernel_stat.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
+#ifndef _BITS_STAT_STRUCT_H
+#define _BITS_STAT_STRUCT_H
+
+#include <sys/stat.h>
+
+/*
+ * The stat structure defined in
+ * libc/sysdeps/linux/common-generic/bits/stat.h
+ * is the same as the kernel one for new architectures
+ */
+#define kernel_stat64	stat
+
+#endif	/*  _BITS_STAT_STRUCT_H */
+
diff --git a/libc/sysdeps/linux/common-generic/bits/stat.h b/libc/sysdeps/linux/common-generic/bits/stat.h
new file mode 100644
index 0000000..053d43b
--- /dev/null
+++ b/libc/sysdeps/linux/common-generic/bits/stat.h
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
+#ifndef _SYS_STAT_H
+# error "Never include <bits/stat.h> directly; use <sys/stat.h> instead."
+#endif
+
+#include <bits/align64bit.h>
+#include <endian.h>
+
+/* Versions of the `struct stat' data structure.  */
+#define _STAT_VER_LINUX_OLD	1
+#define _STAT_VER_KERNEL	1
+#define _STAT_VER_SVR4		2
+#define _STAT_VER_LINUX		3
+#define _STAT_VER		_STAT_VER_LINUX	/* The one defined below.  */
+
+/* Versions of the `xmknod' interface.  */
+#define _MKNOD_VER_LINUX	1
+#define _MKNOD_VER_SVR4		2
+#define _MKNOD_VER		_MKNOD_VER_LINUX /* The bits defined below.  */
+
+/*
+ * For 32-bit architectures, this struct is similar to the stat64 but it
+ * uses 32-bit members along with 32-bit padding. For 64-bit architectures
+ * this struct is exactly the same with the stat64 one
+ */
+struct stat
+  {
+#ifndef __USE_FILE_OFFSET64
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+    unsigned long st_dev;			/* Device.  */
+    unsigned long __pad1;
+    unsigned long st_ino;			/* 32bit file serial number.	*/
+    unsigned long __pad2;
+    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 __pad3;
+    unsigned long long __pad4;
+    long st_size;				/* SIze of file, in bytes.  */
+    long __pad5;
+    int st_blksize;				/* Optimal block size for I/O. */
+    int __pad6;
+    long st_blocks;				/* Number 512-byte blocks allocated */
+    long __pad7;
+# else
+    unsigned long __pad1;
+    unsigned long st_dev;			/* Device. */
+    unsigned long __pad2;
+    unsigned long st_ino;			/* 32bit 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 __pad3;
+    unsigned long st_rdev			/* Device number, if device.  */
+    unsigned long long __pad4;
+    long __pad5;
+    long st_size;				/* Size of file, in bytes. */
+    int __pad6;
+    int st_blksize;				/* Optimal block size for I/O. */
+    long __pad7;
+    long st_blocks;				/* Number 512-byte blocks allocated */
+# endif /* __LITTLE_ENDIAN */
+#else
+    unsigned long long st_dev;			/* Device. */
+    unsigned long long st_ino;			/* 32bit 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 long st_rdev;			/* Device number, if device.  */
+    unsigned long long _pad1;
+    long long st_size;				/* SIze of file, in bytes. */
+    int st_blksize;				/* Optimal block size for I/O. */
+    int __pad2;
+    long long st_blocks;			/* Number 512-byte blocks allocated */
+#endif
+#ifdef __USE_MISC
+    /* Nanosecond resolution timestamps are stored in a format
+       equivalent to 'struct timespec'.  This is the type used
+       whenever possible but the Unix namespace rules do not allow the
+       identifier 'timespec' to appear in the <sys/stat.h> header.
+       Therefore we have to handle the use of this header in strictly
+       standard-compliant sources special.  */
+    struct timespec st_atim;			/* Time of last access.  */
+    struct timespec st_mtim;			/* Time of last modification.  */
+    struct timespec st_ctim;			/* Time of last status change.  */
+# define st_atime st_atim.tv_sec		/* Backward compatibility.  */
+# define st_mtime st_mtim.tv_sec
+# define st_ctime st_ctim.tv_sec
+#else
+# ifndef __USE_FILE_OFFSET64
+    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;
+# else
+    int st_atime;				/* Time of last access. */
+    unsigned int st_atime_nsec;
+    int st_mtime;				/* Time of last modification. */
+    unsigned int st_mtime_nsec;
+    int st_ctime;				/* Time of last status change. */
+    unsigned int st_ctime_nsec;
+# endif
+#endif
+    unsigned int __unused4;
+    unsigned int __unused5;
+  } __ARCH_64BIT_ALIGNMENT__;
+
+
+#ifdef __USE_LARGEFILE64
+struct stat64
+  {
+    unsigned long long st_dev;			/* Device. */
+    unsigned long long st_ino;			/* 32bit 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 long st_rdev;			/* Device number, if device.  */
+    unsigned long long __pad3;
+    long long st_size;				/* Size of file, in bytes. */
+    int st_blksize;				/* Optimal block size for I/O. */
+    int __pad4;
+    long long st_blocks;			/* Number 512-byte blocks allocated */
+# ifdef __USE_MISC
+    /* Nanosecond resolution timestamps are stored in a format
+       equivalent to 'struct timespec'.  This is the type used
+       whenever possible but the Unix namespace rules do not allow the
+       identifier 'timespec' to appear in the <sys/stat.h> header.
+       Therefore we have to handle the use of this header in strictly
+       standard-compliant sources special.  */
+    struct timespec st_atim; 			/* Time of last access.  */
+    struct timespec st_mtim; 			/* Time of last modification.  */
+    struct timespec st_ctim; 			/* Time of last status change.  */
+# else
+    int st_atime;				/* Time of last access. */
+    unsigned int st_atime_nsec;
+    int st_mtime;				/* Time of last modification. */
+    unsigned int st_mtime_nsec;
+    int st_ctime;				/* Time of last status change. */
+    unsigned int st_ctime_nsec;
+# endif
+    unsigned int __unused4;
+    unsigned int __unused5;
+};
+#endif
+
+/* Tell code we have these members.  */
+#define	_STATBUF_ST_BLKSIZE
+#define _STATBUF_ST_RDEV
+/* Nanosecond resolution time values are supported.  */
+#define _STATBUF_ST_NSEC
+
+/* Encoding of the file mode.  */
+
+#define	__S_IFMT	0170000	/* These bits determine file type.  */
+
+/* File types.  */
+#define	__S_IFDIR	0040000	/* Directory.  */
+#define	__S_IFCHR	0020000	/* Character device.  */
+#define	__S_IFBLK	0060000	/* Block device.  */
+#define	__S_IFREG	0100000	/* Regular file.  */
+#define	__S_IFIFO	0010000	/* FIFO.  */
+#define	__S_IFLNK	0120000	/* Symbolic link.  */
+#define	__S_IFSOCK	0140000	/* Socket.  */
+
+/* POSIX.1b objects.  Note that these macros always evaluate to zero.  But
+   they do it by enforcing the correct use of the macros.  */
+#define __S_TYPEISMQ(buf)  ((buf)->st_mode - (buf)->st_mode)
+#define __S_TYPEISSEM(buf) ((buf)->st_mode - (buf)->st_mode)
+#define __S_TYPEISSHM(buf) ((buf)->st_mode - (buf)->st_mode)
+
+/* Protection bits.  */
+
+#define	__S_ISUID	04000	/* Set user ID on execution.  */
+#define	__S_ISGID	02000	/* Set group ID on execution.  */
+#define	__S_ISVTX	01000	/* Save swapped text after use (sticky).  */
+#define	__S_IREAD	0400	/* Read by owner.  */
+#define	__S_IWRITE	0200	/* Write by owner.  */
+#define	__S_IEXEC	0100	/* Execute by owner.  */
+
+#ifdef __USE_ATFILE
+# define UTIME_NOW	((1l << 30) - 1l)
+# define UTIME_OMIT	((1l << 30) - 2l)
+#endif
diff --git a/libc/sysdeps/linux/common-generic/bits/statfs.h b/libc/sysdeps/linux/common-generic/bits/statfs.h
new file mode 100644
index 0000000..a2767b4
--- /dev/null
+++ b/libc/sysdeps/linux/common-generic/bits/statfs.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
+#ifndef _SYS_STATFS_H
+# error "Never include <bits/statfs.h> directly; use <sys/statfs.h> instead."
+#endif
+
+#include <endian.h>
+#include <bits/align64bit.h>
+#include <bits/types.h>
+
+
+struct statfs
+  {
+    __U32_TYPE f_type;
+    __U32_TYPE f_bsize;
+#ifndef __USE_FILE_OFFSET64
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+    __U32_TYPE f_blocks;
+    __U32_TYPE __pad1;
+    __U32_TYPE f_bfree;
+    __U32_TYPE __pad2;
+    __U32_TYPE f_bavail;
+    __U32_TYPE __pad3;
+    __U32_TYPE f_files;
+    __U32_TYPE __pad4;
+    __U32_TYPE f_ffree;
+    __U32_TYPE __pad5;
+# else
+    __U32_TYPE __pad1;
+    __U32_TYPE f_blocks;
+    __U32_TYPE __pad2;
+    __U32_TYPE f_bfree;
+    __U32_TYPE __pad3;
+    __U32_TYPE f_bavail;
+    __U32_TYPE __pad4;
+    __U32_TYPE f_files;
+    __U32_TYPE __pad5;
+    __U32_TYPE f_ffree;
+# endif /* __LITTLE_ENDIAN */
+#else
+    __U64_TYPE f_blocks;
+    __U64_TYPE f_bfree;
+    __U64_TYPE f_bavail;
+    __U64_TYPE f_files;
+    __U64_TYPE f_ffree;
+#endif /* __USE_FILE_OFFSET64 */
+    __fsid_t f_fsid;
+    __U32_TYPE f_namelen;
+    __U32_TYPE f_frsize;
+    __U32_TYPE f_flags;
+    __U32_TYPE f_spare[4];
+  } __ARCH_64BIT_ALIGNMENT__;
+
+#ifdef __USE_LARGEFILE64
+struct statfs64
+  {
+    __U32_TYPE f_type;
+    __U32_TYPE f_bsize;
+    __U64_TYPE f_blocks;
+    __U64_TYPE f_bfree;
+    __U64_TYPE f_bavail;
+    __U64_TYPE f_files;
+    __U64_TYPE f_ffree;
+    __fsid_t f_fsid;
+    __U32_TYPE f_namelen;
+    __U32_TYPE f_frsize;
+    __U32_TYPE f_flags;
+    __U32_TYPE f_spare[4];
+  };
+#endif
+
+/* Tell code we have these members.  */
+#define _STATFS_F_NAMELEN
+#define _STATFS_F_FRSIZE


More information about the uClibc-cvs mailing list