diff options
| author | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-27 15:58:09 -0700 |
|---|---|---|
| committer | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-27 15:58:09 -0700 |
| commit | 286b3e52b426d0f977fde9e49744ae2f3ffdf990 (patch) | |
| tree | e4f1dc3561d136e855ee1e45b5c66f59b90e2752 /src/gcinfo | |
| parent | 57cdf454b123a44ef8d5944f4022b9502ce52d8a (diff) | |
| download | coreclr-286b3e52b426d0f977fde9e49744ae2f3ffdf990.tar.gz coreclr-286b3e52b426d0f977fde9e49744ae2f3ffdf990.tar.bz2 coreclr-286b3e52b426d0f977fde9e49744ae2f3ffdf990.zip | |
Fix Linux/x86 altjit
This is a Linux/x86-targeting, Windows/x86-hosted altjit.
Fix the build so it uses an appropriate gcinfo library, built
with the appropriate defines. Currently, this eliminates a single assert.
Diffstat (limited to 'src/gcinfo')
| -rw-r--r-- | src/gcinfo/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/gcinfo/gcinfo_linuxx86/CMakeLists.txt | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/gcinfo/CMakeLists.txt b/src/gcinfo/CMakeLists.txt index ab7e48dcfd..79c4f486da 100644 --- a/src/gcinfo/CMakeLists.txt +++ b/src/gcinfo/CMakeLists.txt @@ -28,6 +28,11 @@ if (CLR_CMAKE_PLATFORM_ARCH_I386) add_subdirectory(gcinfo_arm) endif () +if (CLR_CMAKE_PLATFORM_ARCH_I386 AND WIN32) + # On x86, build Linux x86 cross-compiling altjit. + add_subdirectory(gcinfo_linuxx86) +endif () + if (CLR_CMAKE_PLATFORM_ARCH_AMD64) # On amd64, build RyuJIT/ARM64 cross-compiling altjit. add_subdirectory(gcinfo_arm64) diff --git a/src/gcinfo/gcinfo_linuxx86/CMakeLists.txt b/src/gcinfo/gcinfo_linuxx86/CMakeLists.txt new file mode 100644 index 0000000000..149f493e22 --- /dev/null +++ b/src/gcinfo/gcinfo_linuxx86/CMakeLists.txt @@ -0,0 +1,6 @@ +add_definitions(-DUNIX_X86_ABI) + +add_library_clr(gcinfo_linuxx86 + STATIC + ${GCINFO_SOURCES} +) |