From owner-svn-src-all@freebsd.org  Wed Aug 24 17:37:07 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4DAA1BC5CD5;
 Wed, 24 Aug 2016 17:37:07 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 170AC1F2F;
 Wed, 24 Aug 2016 17:37:07 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7OHb6Er036298;
 Wed, 24 Aug 2016 17:37:06 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7OHb6k2036297;
 Wed, 24 Aug 2016 17:37:06 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201608241737.u7OHb6k2036297@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Wed, 24 Aug 2016 17:37:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r304763 - vendor/compiler-rt/dist/lib/msan/tests
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Aug 2016 17:37:07 -0000

Author: dim
Date: Wed Aug 24 17:37:06 2016
New Revision: 304763
URL: https://svnweb.freebsd.org/changeset/base/304763

Log:
  Vendor import of compiler-rt release_39 branch r279477:
  https://llvm.org/svn/llvm-project/compiler-rt/branches/release_39@279477

Modified:
  vendor/compiler-rt/dist/lib/msan/tests/msan_test.cc

Modified: vendor/compiler-rt/dist/lib/msan/tests/msan_test.cc
==============================================================================
--- vendor/compiler-rt/dist/lib/msan/tests/msan_test.cc	Wed Aug 24 17:36:39 2016	(r304762)
+++ vendor/compiler-rt/dist/lib/msan/tests/msan_test.cc	Wed Aug 24 17:37:06 2016	(r304763)
@@ -2825,6 +2825,12 @@ TEST(MemorySanitizer, LongStruct) {
   EXPECT_POISONED(s2.a8);
 }
 
+#ifdef __GLIBC__
+#define MSAN_TEST_PRLIMIT __GLIBC_PREREQ(2, 13)
+#else
+#define MSAN_TEST_PRLIMIT 1
+#endif
+
 TEST(MemorySanitizer, getrlimit) {
   struct rlimit limit;
   __msan_poison(&limit, sizeof(limit));
@@ -2833,6 +2839,7 @@ TEST(MemorySanitizer, getrlimit) {
   EXPECT_NOT_POISONED(limit.rlim_cur);
   EXPECT_NOT_POISONED(limit.rlim_max);
 
+#if MSAN_TEST_PRLIMIT
   struct rlimit limit2;
   __msan_poison(&limit2, sizeof(limit2));
   result = prlimit(getpid(), RLIMIT_DATA, &limit, &limit2);
@@ -2848,6 +2855,7 @@ TEST(MemorySanitizer, getrlimit) {
 
   result = prlimit(getpid(), RLIMIT_DATA, &limit, nullptr);
   ASSERT_EQ(result, 0);
+#endif
 }
 
 TEST(MemorySanitizer, getrusage) {