Author: dim Date: Tue Sep 11 10:10:03 2018 New Revision: 338579 URL: https://svnweb.freebsd.org/changeset/base/338579
Log: Vendor import of compiler-rt release_70 branch r341916: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_70@341916 Modified: vendor/compiler-rt/dist-release_70/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Modified: vendor/compiler-rt/dist-release_70/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ============================================================================== --- vendor/compiler-rt/dist-release_70/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Tue Sep 11 10:10:00 2018 (r338578) +++ vendor/compiler-rt/dist-release_70/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Tue Sep 11 10:10:03 2018 (r338579) @@ -1037,7 +1037,11 @@ CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); -#if SANITIZER_LINUX && (!defined(__ANDROID__) || __ANDROID_API__ >= 21) +#ifndef __GLIBC_PREREQ +#define __GLIBC_PREREQ(x, y) 0 +#endif + +#if SANITIZER_LINUX && (__ANDROID_API__ >= 21 || __GLIBC_PREREQ (2, 14)) CHECK_TYPE_SIZE(mmsghdr); CHECK_SIZE_AND_OFFSET(mmsghdr, msg_hdr); CHECK_SIZE_AND_OFFSET(mmsghdr, msg_len); @@ -1078,9 +1082,6 @@ COMPILER_CHECK(sizeof(__sanitizer_sigaction) == sizeof // Can't write checks for sa_handler and sa_sigaction due to them being // preprocessor macros. CHECK_STRUCT_SIZE_AND_OFFSET(sigaction, sa_mask); -#ifndef __GLIBC_PREREQ -#define __GLIBC_PREREQ(x, y) 0 -#endif #if !defined(__s390x__) || __GLIBC_PREREQ (2, 20) // On s390x glibc 2.19 and earlier sa_flags was unsigned long, and sa_resv // didn't exist. _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "[email protected]"
