[llvm-branch-commits] [llvm-branch] r182145 - Merging r181600:

[Bill Wendling]

Author: void
Date: Fri May 17 13:48:58 2013
New Revision: 182145

URL: http://llvm.org/viewvc/llvm-project?rev=182145&view=rev
Log:
Merging r181600:
------------------------------------------------------------------------
r181600 | aaronballman | 2013-05-10 07:42:16 -0700 (Fri, 10 May 2013) | 1 line

XFAILing this test on Win32 to unbreak the build bots.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_33/   (props changed)
    llvm/branches/release_33/test/ExecutionEngine/MCJIT/eh.ll

Propchange: llvm/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 17 13:48:58 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,181286,181296,181313,181397,181423,181450,181524,181529,181540,181576-181580,181586,181792,181800,181842,182072
+/llvm/trunk:155241,181286,181296,181313,181397,181423,181450,181524,181529,181540,181576-181580,181586,181600,181792,181800,181842,182072

Modified: llvm/branches/release_33/test/ExecutionEngine/MCJIT/eh.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_33/test/ExecutionEngine/MCJIT/eh.ll?rev=182145&r1=182144&r2=182145&view=diff
==============================================================================
--- llvm/branches/release_33/test/ExecutionEngine/MCJIT/eh.ll (original)
+++ llvm/branches/release_33/test/ExecutionEngine/MCJIT/eh.ll Fri May 17 13:48:58 2013
@@ -1,5 +1,5 @@
 ; RUN: %lli_mcjit %s
-; XFAIL: arm, cygwin
+; XFAIL: arm, cygwin, win32
 declare i8* @__cxa_allocate_exception(i64)
 declare void @__cxa_throw(i8*, i8*, i8*)
 declare i32 @__gxx_personality_v0(...)