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 | b6bde4d2bc5231cd1b38ff92e51afb3f6e157386 (patch) | |
| tree | 7f87ac00b9a648ca442097c77bfd2898f192a9f8 | |
| parent | fbeab51e1cddbeb73ad0d86d1f650081178c1dd8 (diff) | |
| download | compiler-rt-b6bde4d2bc5231cd1b38ff92e51afb3f6e157386.tar.gz compiler-rt-b6bde4d2bc5231cd1b38ff92e51afb3f6e157386.tar.bz2 compiler-rt-b6bde4d2bc5231cd1b38ff92e51afb3f6e157386.tar.xz | |
[ASan] Bump min supported Mac OS X version to 10.6
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@186404 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 4 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_platform_limits_posix.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b9c23239..21fdf295 100644 --- a/CMakeLists.txt +++ b/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/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc index 4ea85ac0..b60b99bb 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/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/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h index 416759b3..e47f82e4 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/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 }; |