From 7efb96c077ec3c485f52d87d84c29cc2a875bb8b Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hongjiu.lu@intel.com>
Date: Fri, 6 Dec 2013 11:44:55 +0000
Subject: [PATCH] Include <sys/stat.h> if __x86_64__ is defined
* sanitizer_common/sanitizer_platform_limits_linux.cc: Include
<sys/stat.h>, instead of <asm/stat.h>, if __x86_64__ is defined.
(struct___old_kernel_stat_sz): Don't check if __x86_64__ is defined.
From-SVN: r205736
---
libsanitizer/ChangeLog | 6 ++++++
.../sanitizer_common/sanitizer_platform_limits_linux.cc | 6 +++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog
index 5d02ec36e286..3e03d5876603 100644
--- a/libsanitizer/ChangeLog
+++ b/libsanitizer/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-06 H.J. Lu <hongjiu.lu@intel.com>
+
+ * sanitizer_common/sanitizer_platform_limits_linux.cc: Include
+ <sys/stat.h>, instead of <asm/stat.h>, if __x86_64__ is defined.
+ (struct___old_kernel_stat_sz): Don't check if __x86_64__ is defined.
+
2013-12-05 H.J. Lu <hongjiu.lu@intel.com>
* configure.ac (link_sanitizer_common): Add -lm.
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc
index 01de9c936c79..bc37df0df498 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc
@@ -27,6 +27,9 @@
// are not defined anywhere in userspace headers. Fake them. This seems to work
// fine with newer headers, too.
#include <asm/posix_types.h>
+#if defined(__x86_64__)
+#include <sys/stat.h>
+#else
#define ino_t __kernel_ino_t
#define mode_t __kernel_mode_t
#define nlink_t __kernel_nlink_t
@@ -41,6 +44,7 @@
#undef uid_t
#undef gid_t
#undef off_t
+#endif
#include <linux/aio_abi.h>
@@ -58,7 +62,7 @@ namespace __sanitizer {
unsigned struct_statfs64_sz = sizeof(struct statfs64);
} // namespace __sanitizer
-#if !defined(__powerpc64__)
+#if !defined(__powerpc64__) && !defined(__x86_64__)
COMPILER_CHECK(struct___old_kernel_stat_sz == sizeof(struct __old_kernel_stat));
#endif
--
GitLab