diff options
| author | Mike McLaughlin <mikem@microsoft.com> | 2019-02-19 23:16:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-19 23:16:25 -0800 |
| commit | e0c2cc567cb7b5072eb71b0ff788da2ffde63a7d (patch) | |
| tree | a0af12fe83d45164c1e82105735386dcb45943bd /src/dlls/mscordac | |
| parent | 7322038ab453067787c9d8ea2ac9047c76c434ff (diff) | |
| download | coreclr-e0c2cc567cb7b5072eb71b0ff788da2ffde63a7d.tar.gz coreclr-e0c2cc567cb7b5072eb71b0ff788da2ffde63a7d.tar.bz2 coreclr-e0c2cc567cb7b5072eb71b0ff788da2ffde63a7d.zip | |
Fix CLRDataCreateInstance export. This was breaking SOS. (#22701)
Fix CLRDataCreateInstance export. This was breaking SOS.
Added the right cmake magic so the function is exported properly.
Diffstat (limited to 'src/dlls/mscordac')
| -rw-r--r-- | src/dlls/mscordac/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/dlls/mscordac/mscordac.cpp | 18 |
2 files changed, 3 insertions, 19 deletions
diff --git a/src/dlls/mscordac/CMakeLists.txt b/src/dlls/mscordac/CMakeLists.txt index 99a011df70..e065eba023 100644 --- a/src/dlls/mscordac/CMakeLists.txt +++ b/src/dlls/mscordac/CMakeLists.txt @@ -124,8 +124,10 @@ set(COREDAC_LIBRARIES ${START_LIBRARY_GROUP} # Start group of libraries that have circular references cee_dac cordbee_dac + ${START_WHOLE_ARCHIVE} # force all exports to be available corguids daccess + ${END_WHOLE_ARCHIVE} dbgutil mdcompiler_dac mdhotdata_dac @@ -177,8 +179,8 @@ else(WIN32) mscorrc_debug ${START_WHOLE_ARCHIVE} # force all PAL objects to be included so all exports are available coreclrpal - ${END_WHOLE_ARCHIVE} palrt + ${END_WHOLE_ARCHIVE} ) endif(WIN32) diff --git a/src/dlls/mscordac/mscordac.cpp b/src/dlls/mscordac/mscordac.cpp index d126704a60..45274bad55 100644 --- a/src/dlls/mscordac/mscordac.cpp +++ b/src/dlls/mscordac/mscordac.cpp @@ -1,21 +1,3 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. - -#ifdef FEATURE_PAL - -#include <clrdata.h> - -// -// This dummy reference to CLRDataCreateInstance prevents the LLVM toolchain from optimizing this important export out. -// -#ifdef __GNUC__ -__attribute__((used)) -#endif // __GNUC__ -void -DummyReferenceToExportedAPI() -{ - CLRDataCreateInstance(IID_ICLRDataTarget, NULL, NULL); -} - -#endif // FEATURE_PAL |