[PATCH] Fix aarch64 decoding of arm struct stat64.

Dmitry V. Levin ldv at altlinux.org
Sun Apr 6 15:20:04 UTC 2014


> diff --git a/file.c b/file.c
> index 7e0773d..b2790e0 100644
> --- a/file.c
> +++ b/file.c
> @@ -181,10 +181,6 @@ struct __old_kernel_stat {
>  #undef st_mtime
>  #undef st_ctime
> 
> -#ifdef AARCH64
> -#define stat64 stat
> -#endif /* AARCH64 */
> -
>  #include <fcntl.h>
>  #ifdef HAVE_SYS_VFS_H
>  # include <sys/vfs.h>

This hunk doesn't apply - it conflicts with commit
a07cfcc133f4adf5116a32b199c4230e022475da.

> @@ -1053,10 +1053,16 @@ struct stat64 {
>   unsigned int st_ctime;
>   unsigned int st_ctime_nsec;
>   unsigned long long st_ino;
> -} __attribute__((packed));
> +}
> +#if defined X86_64
> +__attribute__((packed))
> +#endif
> +;
>  # define HAVE_STAT64 1
> +#if defined X86_64
>  # define STAT64_SIZE 96
>  #endif
> +#endif

Why do you disable STAT64_SIZE check for AARCH64?
BTW, this hunk introduces wrong indentation.


-- 
ldv
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20140406/fd83ba38/attachment.bin>


More information about the Strace-devel mailing list