[llvm-branch-commits] [compiler-rt-branch] r341524 - Merging r341442:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Sep  6 01:19:33 2018
New Revision: 341524

URL: http://llvm.org/viewvc/llvm-project?rev=341524&view=rev
Log:
Merging r341442:
------------------------------------------------------------------------
r341442 | bcain | 2018-09-05 04:15:54 +0200 (Wed, 05 Sep 2018) | 8 lines

Add glibc_prereq to platform limits mmsghdr

sendmmsg requires glibc >= 2.14.

Fixes PR38589.

Review: https://reviews.llvm.org/D51538

------------------------------------------------------------------------

Modified:
    compiler-rt/branches/release_70/   (props changed)
    compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_platform_limits_posix.cc

Propchange: compiler-rt/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep  6 01:19:33 2018
@@ -1 +1 @@
-/compiler-rt/trunk:338577,338606,339303,340758,340769
+/compiler-rt/trunk:338577,338606,339303,340758,340769,341442

Modified: compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_platform_limits_posix.cc?rev=341524&r1=341523&r2=341524&view=diff
==============================================================================
--- compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_platform_limits_posix.cc (original)
+++ compiler-rt/branches/release_70/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Thu Sep  6 01:19:33 2018
@@ -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_sigact
 // 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.