diff options
author | Jiyoung Yun <jy910.yun@samsung.com> | 2017-06-13 18:47:36 +0900 |
---|---|---|
committer | Jiyoung Yun <jy910.yun@samsung.com> | 2017-06-13 18:47:36 +0900 |
commit | 61d6a817e39d3bae0f47dbc09838d51db22a5d30 (patch) | |
tree | cb37caa1784bc738b976273335d6ed04a7cc80b0 /src/dlls | |
parent | 5b975f8233e8c8d17b215372f89ca713b45d6a0b (diff) | |
download | coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.gz coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.tar.bz2 coreclr-61d6a817e39d3bae0f47dbc09838d51db22a5d30.zip |
Imported Upstream version 2.0.0.11992upstream/2.0.0.11992
Diffstat (limited to 'src/dlls')
-rw-r--r-- | src/dlls/mscordac/mscordac_unixexports.src | 1 | ||||
-rw-r--r-- | src/dlls/mscoree/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/dlls/mscoree/coreclr/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/dlls/mscoree/gdbjit_unixexports.src | 3 | ||||
-rw-r--r-- | src/dlls/mscorpe/iceefilegen.cpp | 4 |
5 files changed, 18 insertions, 1 deletions
diff --git a/src/dlls/mscordac/mscordac_unixexports.src b/src/dlls/mscordac/mscordac_unixexports.src index b0c3b0463c..9881def613 100644 --- a/src/dlls/mscordac/mscordac_unixexports.src +++ b/src/dlls/mscordac/mscordac_unixexports.src @@ -39,6 +39,7 @@ PAL_fprintf PAL__wcstoui64 PAL_wcstoul PAL_iswprint +PAL_VirtualReserveFromExecutableMemoryAllocatorWithinRange PAL_wcslen PAL_wcsncmp PAL_wcsrchr diff --git a/src/dlls/mscoree/CMakeLists.txt b/src/dlls/mscoree/CMakeLists.txt index b9c129db5e..8fc3ebfb41 100644 --- a/src/dlls/mscoree/CMakeLists.txt +++ b/src/dlls/mscoree/CMakeLists.txt @@ -22,6 +22,11 @@ else() set (DEF_SOURCES mscorwks_unixexports.src ) +if(FEATURE_GDBJIT) + list(APPEND DEF_SOURCES + gdbjit_unixexports.src + ) +endif(FEATURE_GDBJIT) endif(WIN32) convert_to_absolute_path(DEF_SOURCES ${DEF_SOURCES}) diff --git a/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/dlls/mscoree/coreclr/CMakeLists.txt index afa253f08f..7a4617fc52 100644 --- a/src/dlls/mscoree/coreclr/CMakeLists.txt +++ b/src/dlls/mscoree/coreclr/CMakeLists.txt @@ -141,6 +141,12 @@ if(CLR_CMAKE_PLATFORM_UNIX AND FEATURE_EVENT_TRACE) ) endif(CLR_CMAKE_PLATFORM_UNIX AND FEATURE_EVENT_TRACE) +if(CLR_CMAKE_PLATFORM_LINUX) + list(APPEND CORECLR_LIBRARIES + eventpipe + ) +endif(CLR_CMAKE_PLATFORM_LINUX) + target_link_libraries(coreclr ${CORECLR_LIBRARIES}) if(WIN32) diff --git a/src/dlls/mscoree/gdbjit_unixexports.src b/src/dlls/mscoree/gdbjit_unixexports.src new file mode 100644 index 0000000000..b820aebf9b --- /dev/null +++ b/src/dlls/mscoree/gdbjit_unixexports.src @@ -0,0 +1,3 @@ +; exported for GDBJIT +__jit_debug_register_code +__jit_debug_descriptor
\ No newline at end of file diff --git a/src/dlls/mscorpe/iceefilegen.cpp b/src/dlls/mscorpe/iceefilegen.cpp index f4323b9e8c..c48ae7e094 100644 --- a/src/dlls/mscorpe/iceefilegen.cpp +++ b/src/dlls/mscorpe/iceefilegen.cpp @@ -151,7 +151,9 @@ HRESULT ICeeFileGen::CreateCeeFileFromICeeGen(ICeeGen *pICeeGen, HCEEFILE *ceeFi return E_POINTER; CCeeGen *genFrom = reinterpret_cast<CCeeGen*>(pICeeGen); CeeFileGenWriter *gen = NULL; - if (FAILED(CeeFileGenWriter::CreateNewInstance(genFrom, gen, createFlags))) return FALSE; + HRESULT hr = CeeFileGenWriter::CreateNewInstance(genFrom, gen, createFlags); + if (FAILED(hr)) + return hr; TESTANDRETURN(gen != NULL, E_OUTOFMEMORY); *ceeFile = gen; return S_OK; |