[compiler-rt] r341442 - Add glibc_prereq to platform limits mmsghdr

[Hans Wennborg via llvm-commits]

Merged to 7.0 in r341524.

On Wed, Sep 5, 2018 at 4:15 AM, Brian Cain via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: bcain
> Date: Tue Sep  4 19:15:54 2018
> New Revision: 341442
>
> URL: http://llvm.org/viewvc/llvm-project?rev=341442&view=rev
> Log:
> Add glibc_prereq to platform limits mmsghdr
>
> sendmmsg requires glibc >= 2.14.
>
> Fixes PR38589.
>
> Review: https://reviews.llvm.org/D51538
>
> Modified:
>     compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
>
> Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc?rev=341442&r1=341441&r2=341442&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc (original)
> +++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Tue Sep  4 19:15:54 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.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits