Skip to content

Commit

Permalink
Merge pull request #20571 from 0xdaryl/frontend
Browse files Browse the repository at this point in the history
OpenJ9 JIT changes to support OMR FrontEnd base class refactoring
  • Loading branch information
dsouzai authored Dec 2, 2024
2 parents 7576b59 + 05d16cf commit 25be1e9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
4 changes: 2 additions & 2 deletions runtime/compiler/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ endif()
set(REMOVED_OMR_FILES
${omr_SOURCE_DIR}/compiler/codegen/CCData.cpp
${omr_SOURCE_DIR}/compiler/control/CompileMethod.cpp
${omr_SOURCE_DIR}/compiler/env/FEBase.cpp
${omr_SOURCE_DIR}/compiler/optimizer/FEInliner.cpp
${omr_SOURCE_DIR}/compiler/env/JitConfig.cpp
${omr_SOURCE_DIR}/compiler/env/OMRJitConfig.cpp
${omr_SOURCE_DIR}/compiler/env/OMRFrontEnd.cpp
${omr_SOURCE_DIR}/compiler/env/PersistentAllocator.cpp
${omr_SOURCE_DIR}/compiler/env/SystemSegmentProvider.cpp
${omr_SOURCE_DIR}/compiler/infra/OMRMonitor.cpp
Expand Down
5 changes: 0 additions & 5 deletions runtime/compiler/x/env/J9CPU.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,13 @@
#include "env/CPU.hpp"
#include "env/VMJ9.h"
#include "x/runtime/X86Runtime.hpp"
#include "env/JitConfig.hpp"
#include "codegen/CodeGenerator.hpp"
#if defined(J9VM_OPT_JITSERVER)
#include "control/CompilationRuntime.hpp"
#include "control/CompilationThread.hpp"
#include "runtime/JITClientSession.hpp"
#endif /* defined(J9VM_OPT_JITSERVER) */

// This is a workaround to avoid J9_PROJECT_SPECIFIC macros in x/env/OMRCPU.cpp
// Without this definition, we get an undefined symbol of JITConfig::instance() at runtime
TR::JitConfig * TR::JitConfig::instance() { return NULL; }

TR::CPU
J9::X86::CPU::detectRelocatable(OMRPortLibrary * const omrPortLib)
{
Expand Down

0 comments on commit 25be1e9

Please sign in to comment.