From: H.J. Lu Date: Thu, 14 Feb 2013 16:54:01 +0000 (-0800) Subject: OFF_T: Merged from upstream r175140 X-Git-Tag: upstream/12.2.0~71235 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8afd2ed7206a0859f41c50c440615a4d06800a04;p=platform%2Fupstream%2Fgcc.git OFF_T: Merged from upstream r175140 PR bootstrap/56327 * interception/interception.h (OFF_T): Merged from upstream r175140. From-SVN: r196054 --- diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 861502f..eb6a345 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,10 +1,16 @@ +2013-02-14 H.J. Lu + + PR bootstrap/56327 + * interception/interception.h (OFF_T): Merged from upstream + r175140. + 2013-02-13 Jakub Jelinek * asan/asan_mapping.h (SHADOW_OFFSET): Set to (1ULL << 44) on x86-64. 2013-02-13 Kostya Serebryany - PR sanitizer/56128 + PR sanitizer/56128 * All source files: Merge from upstream r175049. * interception/Makefile.am: added include path. * interception/Makefile.in: Regenerated. @@ -15,7 +21,7 @@ 2013-01-23 Kostya Serebryany - PR sanitizer/55989 + PR sanitizer/55989 * All source files: Merge from upstream r173241. * merge.sh: Support merging .inc files. 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;