OFF_T: Merged from upstream r175140

PR bootstrap/56327
	* interception/interception.h (OFF_T): Merged from upstream
	r175140.

From-SVN: r196054
This commit is contained in:
H.J. Lu 2013-02-14 08:54:01 -08:00
parent 1c322ab156
commit 8afd2ed720
2 changed files with 10 additions and 4 deletions

View File

@ -1,10 +1,16 @@
2013-02-14 H.J. Lu <hongjiu.lu@intel.com>
PR bootstrap/56327
* interception/interception.h (OFF_T): Merged from upstream
r175140.
2013-02-13 Jakub Jelinek <jakub@redhat.com>
* asan/asan_mapping.h (SHADOW_OFFSET): Set to (1ULL << 44) on x86-64.
2013-02-13 Kostya Serebryany <kcc@google.com>
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 <kcc@google.com>
PR sanitizer/55989
PR sanitizer/55989
* All source files: Merge from upstream r173241.
* merge.sh: Support merging .inc files.

View File

@ -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;