Author: hans Date: Wed Feb 17 10:40:51 2016 New Revision: 261106 URL: http://llvm.org/viewvc/llvm-project?rev=261106&view=rev Log: Merging r261033: ------------------------------------------------------------------------ r261033 | akaylor | 2016-02-16 15:52:18 -0800 (Tue, 16 Feb 2016) | 5 lines
Fix build LLVM with -D LLVM_USE_INTEL_JITEVENTS:BOOL=ON on Windows Differential Revision: http://reviews.llvm.org/D16940 ------------------------------------------------------------------------ Modified: llvm/branches/release_38/ (props changed) llvm/branches/release_38/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt llvm/branches/release_38/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt Propchange: llvm/branches/release_38/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 17 10:40:51 2016 @@ -1,3 +1,3 @@ /llvm/branches/Apple/Pertwee:110850,110961 /llvm/branches/type-system-rewrite:133420-134817 -/llvm/trunk:155241,257645,257648,257730,257775,257791,257864,257875,257886,257902,257905,257925,257929-257930,257940,257942,257977,257979,257997,258103,258112,258168,258184,258207,258221,258273,258325,258406,258416,258428,258436,258471,258690,258729,258891,258971,259177-259178,259228,259236,259342,259346,259375,259381,259645,259649,259695-259696,259740,259798,259835,259840,259886,259888,259958,260390,260427,260587,260641,260703 +/llvm/trunk:155241,257645,257648,257730,257775,257791,257864,257875,257886,257902,257905,257925,257929-257930,257940,257942,257977,257979,257997,258103,258112,258168,258184,258207,258221,258273,258325,258406,258416,258428,258436,258471,258690,258729,258891,258971,259177-259178,259228,259236,259342,259346,259375,259381,259645,259649,259695-259696,259740,259798,259835,259840,259886,259888,259958,260390,260427,260587,260641,260703,261033 Modified: llvm/branches/release_38/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt?rev=261106&r1=261105&r2=261106&view=diff ============================================================================== --- llvm/branches/release_38/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt (original) +++ llvm/branches/release_38/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt Wed Feb 17 10:40:51 2016 @@ -1,8 +1,17 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) +if( HAVE_LIBDL ) + set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS}) +endif() +if( HAVE_LIBPTHREAD ) + set(LLVM_INTEL_JIT_LIBS pthread ${LLVM_INTEL_JIT_LIBS}) +endif() + add_llvm_library(LLVMIntelJITEvents IntelJITEventListener.cpp jitprofiling.c - LINK_LIBS pthread ${CMAKE_DL_LIBS} + LINK_LIBS ${LLVM_INTEL_JIT_LIBS} ) + +add_dependencies(LLVMIntelJITEvents LLVMCodeGen) Modified: llvm/branches/release_38/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt?rev=261106&r1=261105&r2=261106&view=diff ============================================================================== --- llvm/branches/release_38/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt (original) +++ llvm/branches/release_38/lib/ExecutionEngine/IntelJITEvents/LLVMBuild.txt Wed Feb 17 10:40:51 2016 @@ -21,4 +21,4 @@ type = OptionalLibrary name = IntelJITEvents parent = ExecutionEngine -required_libraries = Core DebugInfoDWARF Support Object ExecutionEngine +required_libraries = CodeGen Core DebugInfoDWARF Support Object ExecutionEngine _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
