From 87f51c5eadd9e9d5a73b7062224be3e3c889f1f9 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Thu, 18 Aug 2022 17:41:53 +0300 Subject: [PATCH] Fix dependency of RISC-V targets on common JIT code Fixes #15861 --- CMakeLists.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97b9bbde52..8c5dbcd989 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -426,6 +426,15 @@ if(WIN32) endif() +set(CommonJIT + Core/MIPS/JitCommon/JitCommon.cpp + Core/MIPS/JitCommon/JitCommon.h + Core/MIPS/JitCommon/JitBlockCache.cpp + Core/MIPS/JitCommon/JitBlockCache.h + Core/MIPS/JitCommon/JitState.cpp + Core/MIPS/JitCommon/JitState.h +) + set(CommonX86 Common/ABI.cpp Common/ABI.h @@ -464,6 +473,7 @@ set(CommonMIPS source_group(MIPS FILES ${CommonMIPS}) set(CommonRISCV64 + ${CommonJIT} Common/RiscVCPUDetect.cpp Core/MIPS/fake/FakeJit.cpp Core/MIPS/fake/FakeJit.h @@ -1626,6 +1636,7 @@ set(GPU_SOURCES # SHARED on ANDROID, STATIC everywhere else add_library(${CoreLibName} ${CoreLinkType} ${CoreExtra} + ${CommonJIT} Core/Config.cpp Core/Config.h Core/ConfigValues.h @@ -1933,12 +1944,6 @@ add_library(${CoreLibName} ${CoreLinkType} Core/FileLoaders/RamCachingFileLoader.h Core/FileLoaders/RetryingFileLoader.cpp Core/FileLoaders/RetryingFileLoader.h - Core/MIPS/JitCommon/JitCommon.cpp - Core/MIPS/JitCommon/JitCommon.h - Core/MIPS/JitCommon/JitBlockCache.cpp - Core/MIPS/JitCommon/JitBlockCache.h - Core/MIPS/JitCommon/JitState.cpp - Core/MIPS/JitCommon/JitState.h Core/MIPS/MIPS.cpp Core/MIPS/MIPS.h Core/MIPS/MIPSAnalyst.cpp