From 8afd2ed7206a0859f41c50c440615a4d06800a04 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 14 Feb 2013 08:54:01 -0800 Subject: [PATCH] OFF_T: Merged from upstream r175140 PR bootstrap/56327 * interception/interception.h (OFF_T): Merged from upstream r175140. From-SVN: r196054 --- libsanitizer/ChangeLog | 10 ++++++++-- libsanitizer/interception/interception.h | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 861502f85aa..eb6a3456e47 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 b4c4137e88e..c4c5026c7ed 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; -- 2.11.4.GIT