diff options
| author | Alexey Samsonov <samsonov@google.com> | 2013-07-16 11:54:40 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2013-07-16 11:54:40 +0000 |
| commit | eb7973246ff6ec616e15ed06336f979acc50d4bc (patch) | |
| tree | 4d7c5ba2ada65249a8de447155f7ac9bc5d63695 | |
| parent | a73970b6626a1b2f9dd8b852751f498c092a54a8 (diff) | |
| download | bcm5719-llvm-eb7973246ff6ec616e15ed06336f979acc50d4bc.tar.gz bcm5719-llvm-eb7973246ff6ec616e15ed06336f979acc50d4bc.zip | |
[ASan] Bump min supported Mac OS X version to 10.6
llvm-svn: 186404
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index b9c232393d3..21fdf2951d6 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -155,7 +155,7 @@ if(APPLE) if(COMPILER_RT_USES_LIBCXX) set(SANITIZER_MIN_OSX_VERSION 10.7) else() - set(SANITIZER_MIN_OSX_VERSION 10.5) + set(SANITIZER_MIN_OSX_VERSION 10.6) endif() list(APPEND SANITIZER_COMMON_CFLAGS -mmacosx-version-min=${SANITIZER_MIN_OSX_VERSION}) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc index 4ea85ac0dcf..b60b99bbf1b 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -797,7 +797,9 @@ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent)); CHECK_SIZE_AND_OFFSET(dirent, d_ino); -#ifndef SANITIZER_MAC +#if SANITIZER_MAC +CHECK_SIZE_AND_OFFSET(dirent, d_seekoff); +#else CHECK_SIZE_AND_OFFSET(dirent, d_off); #endif CHECK_SIZE_AND_OFFSET(dirent, d_reclen); diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h index 416759b397e..e47f82e4238 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h @@ -96,7 +96,8 @@ namespace __sanitizer { #if SANITIZER_MAC struct __sanitizer_dirent { - unsigned d_ino; + unsigned long long d_ino; + unsigned long long d_seekoff; unsigned short d_reclen; // more fields that we don't care about }; |
