Move x32 <asm/stat.h> replacement to x32 specific directory

As tests-m*32/Makefile.am files now refer to proper arch specific
directories, it's possible to relocate x32 <asm/stat.h> replacement
to its arch specific directory.

* linux/x86_64/asm_stat.h: Move ...
* linux/x32/asm_stat.h: ... here, remove x32 guard.
* Makefile.am (strace_SOURCES): Remove linux/x86_64/asm_stat.h.

diff --git a/Makefile.am b/Makefile.am
index 0ed722edfcd66dc13af734644013db8ce9c73001..89cf2df9551b79e617b59fa4e7cd68dee949006c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,7 +93,6 @@ strace_SOURCES =      \
        link.c          \
        linux/asm_stat.h \
        linux/x32/asm_stat.h \
-       linux/x86_64/asm_stat.h \
        lookup_dcookie.c \
        loop.c          \
        lseek.c         \

diff --git a/linux/x32/asm_stat.h b/linux/x32/asm_stat.h
index 865aa4a09b0ec604fc63d4e452d213bb8f04f110..6713ac456872106e76c9ec13c5e17d829fe4873a 100644 (file)
--- a/linux/x32/asm_stat.h
+++ b/linux/x32/asm_stat.h
@@ -1 +1,47 @@
-#include "x86_64/asm_stat.h"
+/*
+ * This is a replacement for x32 <asm/stat.h> which
+ * appears to be wrong in older kernel headers.
+ */
+
+#ifndef STRACE_ASM_STAT_H
+
+# define STRACE_ASM_STAT_H
+
+# include "kernel_types.h"
+
+struct stat {
+       kernel_ulong_t  st_dev;
+       kernel_ulong_t  st_ino;
+       kernel_ulong_t  st_nlink;
+       unsigned int    st_mode;
+       unsigned int    st_uid;
+       unsigned int    st_gid;
+       unsigned int    pad0__;
+       kernel_ulong_t  st_rdev;
+       kernel_long_t   st_size;
+       kernel_long_t   st_blksize;
+       kernel_long_t   st_blocks;
+       kernel_ulong_t  st_atime;
+       kernel_ulong_t  st_atime_nsec;
+       kernel_ulong_t  st_mtime;
+       kernel_ulong_t  st_mtime_nsec;
+       kernel_ulong_t  st_ctime;
+       kernel_ulong_t  st_ctime_nsec;
+       kernel_long_t   pad1__[3];
+};
+
+struct __old_kernel_stat {
+       unsigned short st_dev;
+       unsigned short st_ino;
+       unsigned short st_mode;
+       unsigned short st_nlink;
+       unsigned short st_uid;
+       unsigned short st_gid;
+       unsigned short st_rdev;
+       unsigned int  st_size;
+       unsigned int  st_atime;
+       unsigned int  st_mtime;
+       unsigned int  st_ctime;
+};
+
+#endif /* !STRACE_ASM_STAT_H */

diff --git a/linux/x86_64/asm_stat.h b/linux/x86_64/asm_stat.h
deleted file mode 100644 (file)
index 53042c5..0000000
--- a/linux/x86_64/asm_stat.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#if defined __x86_64__ && defined __ILP32__
-
-/*
- * This is a replacement for x32 <asm/stat.h> which
- * appears to be wrong in older kernel headers.
- */
-
-# ifndef STRACE_ASM_STAT_H
-
-#  define STRACE_ASM_STAT_H
-
-#  include "kernel_types.h"
-
-struct stat {
-       kernel_ulong_t  st_dev;
-       kernel_ulong_t  st_ino;
-       kernel_ulong_t  st_nlink;
-       unsigned int    st_mode;
-       unsigned int    st_uid;
-       unsigned int    st_gid;
-       unsigned int    pad0__;
-       kernel_ulong_t  st_rdev;
-       kernel_long_t   st_size;
-       kernel_long_t   st_blksize;
-       kernel_long_t   st_blocks;
-       kernel_ulong_t  st_atime;
-       kernel_ulong_t  st_atime_nsec;
-       kernel_ulong_t  st_mtime;
-       kernel_ulong_t  st_mtime_nsec;
-       kernel_ulong_t  st_ctime;
-       kernel_ulong_t  st_ctime_nsec;
-       kernel_long_t   pad1__[3];
-};
-
-struct __old_kernel_stat {
-       unsigned short st_dev;
-       unsigned short st_ino;
-       unsigned short st_mode;
-       unsigned short st_nlink;
-       unsigned short st_uid;
-       unsigned short st_gid;
-       unsigned short st_rdev;
-       unsigned int  st_size;
-       unsigned int  st_atime;
-       unsigned int  st_mtime;
-       unsigned int  st_ctime;
-};
-
-# endif /* !STRACE_ASM_STAT_H */
-
-#else
-
-# include "linux/asm_stat.h"
-
-#endif