[llvm-branch-commits] [compiler-rt-branch] r270397 - Merging r261721:

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

Author: mohit.bhakkad
Date: Mon May 23 02:00:54 2016
New Revision: 270397

URL: http://llvm.org/viewvc/llvm-project?rev=270397&view=rev
Log:
Merging r261721:
------------------------------------------------------------------------
r261721 | mohit.bhakkad | 2016-02-24 12:38:33 +0530 (Wed, 24 Feb 2016) | 7 lines

[MSan] Mark dlerror.cc expected failure for MIPS

Reviewers: samsonov

Subscribers: jaydeep, sagar, llvm-commits, aemerson

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

Modified:
    compiler-rt/branches/release_38/   (props changed)
    compiler-rt/branches/release_38/test/msan/dlerror.cc

Propchange: compiler-rt/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 23 02:00:54 2016
@@ -1 +1 @@
-/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513
+/compiler-rt/trunk:258916,259755,260669,260839,260946,261073,261142,261148,261193,261263,261513,261721

Modified: compiler-rt/branches/release_38/test/msan/dlerror.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/test/msan/dlerror.cc?rev=270397&r1=270396&r2=270397&view=diff
==============================================================================
--- compiler-rt/branches/release_38/test/msan/dlerror.cc (original)
+++ compiler-rt/branches/release_38/test/msan/dlerror.cc Mon May 23 02:00:54 2016
@@ -1,8 +1,9 @@
 // RUN: %clangxx_msan -O0 %s -o %t && %run %t
 //
-// AArch64 shows fails with uninitialized bytes in __interceptor_strcmp from
+// AArch64, MIPS64 shows fails with uninitialized bytes in __interceptor_strcmp from
 // dlfcn/dlerror.c:107 (glibc).
 // XFAIL: aarch64
+// XFAIL: mips64
 
 #include <assert.h>
 #include <dlfcn.h>