[llvm-branch-commits] [llvm-branch] r243928 - Merging r243639:

[Hans Wennborg]

Author: hans
Date: Mon Aug  3 19:44:24 2015
New Revision: 243928

URL: http://llvm.org/viewvc/llvm-project?rev=243928&view=rev
Log:
Merging r243639:
------------------------------------------------------------------------
r243639 | chapuni | 2015-07-30 06:06:53 -0700 (Thu, 30 Jul 2015) | 1 line

MCJITTests/MCJITCAPITest.cpp: Try to appease i686-win32.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_37/   (props changed)
    llvm/branches/release_37/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp

Propchange: llvm/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  3 19:44:24 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638,243640,243745
+/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638-243640,243745

Modified: llvm/branches/release_37/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp?rev=243928&r1=243927&r2=243928&view=diff
==============================================================================
--- llvm/branches/release_37/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp (original)
+++ llvm/branches/release_37/unittests/ExecutionEngine/MCJIT/MCJITCAPITest.cpp Mon Aug  3 19:44:24 2015
@@ -496,6 +496,7 @@ TEST_F(MCJITCAPITest, addGlobalMapping)
   SKIP_UNSUPPORTED_PLATFORM;
 
   Module = LLVMModuleCreateWithName("testModule");
+  LLVMSetTarget(Module, HostTriple.c_str());
   LLVMTypeRef FunctionType = LLVMFunctionType(LLVMInt32Type(), NULL, 0, 0);
   LLVMValueRef MappedFn = LLVMAddFunction(Module, "mapped_fn", FunctionType);