On Thu, Feb 14, 2013 at 08:33:27AM -0800, H.J. Lu wrote:
> 2013-02-14 H.J. Lu <hongjiu...@intel.com>
>
> PR bootstrap/56327
> * interception/interception.h (OFF_T): Merged from upstream
> r175140.
Ok.
> diff --git a/libsanitizer/interception/interception.h
> b/libsanitizer/interception/interception.h
> index b4c4137..c4c5026 100644
> --- a/libsanitizer/interception/interception.h
> +++ b/libsanitizer/interception/interception.h
> @@ -28,8 +28,8 @@ typedef __sanitizer::s64 INTMAX_T;
> // WARNING: OFF_T may be different from OS type off_t, depending on
> the value of
> // _FILE_OFFSET_BITS. This definition of OFF_T matches the ABI of system
> calls
> // like pread and mmap, as opposed to pread64 and mmap64.
> -// Mac is special.
> -#ifdef __APPLE__
> +// Mac and Linux/x86-64 are special.
> +#if defined(__APPLE__) || (defined(__linux__) && defined(__x86_64__))
> typedef __sanitizer::u64 OFF_T;
> #else
> typedef __sanitizer::uptr OFF_T;
Jakub
