diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2013-12-06 11:44:55 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2013-12-06 03:44:55 -0800 |
| commit | 7efb96c077ec3c485f52d87d84c29cc2a875bb8b (patch) | |
| tree | 33b176fac3187df8dee2ba08898b49ecea5c87f2 | |
| parent | fde66fde162b08a98b5fe66be20704a8e82784ac (diff) | |
| download | gcc-7efb96c077ec3c485f52d87d84c29cc2a875bb8b.zip gcc-7efb96c077ec3c485f52d87d84c29cc2a875bb8b.tar.gz gcc-7efb96c077ec3c485f52d87d84c29cc2a875bb8b.tar.bz2 | |
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
| -rw-r--r-- | libsanitizer/ChangeLog | 6 | ||||
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_platform_limits_linux.cc | 6 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 5d02ec3..3e03d58 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 01de9c9..bc37df0 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 |