[llvm-branch-commits] [compiler-rt-branch] r270035 - Merging rL260946:

[Mohit K. Bhakkad via llvm-branch-commits]

Author: mohit.bhakkad
Date: Thu May 19 05:17:04 2016
New Revision: 270035

URL: http://llvm.org/viewvc/llvm-project?rev=270035&view=rev
Log:
Merging rL260946:
-----------------------------------------------------------------
[Compiler-rt][MSan][MIPS] Resolve gethostbyname_r_erange for MIPS

Reviewers: eugenis, kcc, samsonov

Subscribers: jaydeep, sagar, llvm-commits

Differential Revision: http://reviews.llvm.org/D17135
-----------------------------------------------------------------

Modified:
    compiler-rt/branches/release_38/   (props changed)
    compiler-rt/branches/release_38/lib/msan/tests/msan_test.cc

Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 19 05:17:04 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916,259755,260669,260839,261073,261142,261148,261193,261263
+/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263

Modified: compiler-rt/branches/release_38/lib/msan/tests/msan_test.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/lib/msan/tests/msan_test.cc?rev=270035&r1=270034&r2=270035&view=diff
==============================================================================
--- compiler-rt/branches/release_38/lib/msan/tests/msan_test.cc (original)
+++ compiler-rt/branches/release_38/lib/msan/tests/msan_test.cc Thu May 19 05:17:04 2016
@@ -1117,8 +1117,8 @@ TEST(MemorySanitizer, gethostbyname_r_er
   struct hostent he;
   struct hostent *result;
   int err;
-  int res = gethostbyname_r("localhost", &he, buf, sizeof(buf), &result, &err);
-  ASSERT_EQ(ERANGE, res);
+  gethostbyname_r("localhost", &he, buf, sizeof(buf), &result, &err);
+  ASSERT_EQ(ERANGE, errno);
   EXPECT_NOT_POISONED(err);
 }