Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-07-04 23:36:00 +02:00
Code Activity

LLVM linux fixes

Browse source
This commit is contained in:
Brian Fiete 2024-05-07 18:09:01 -04:00
parent 29f6313bb3
commit b0a559e464
9 changed files with 36 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

125
IDEHelper/CMakeLists.txt
View file

@ -33,7 +33,7 @@ add_definitions(
-DBFSYSLIB_DYNAMIC
)
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD 17)
#add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
INCLUDE(CheckIncludeFiles)
@ -168,7 +168,7 @@ file(GLOB SRC_FILES
Backend/BeModule.cpp
)
find_package(LLVM 13 CONFIG COMPONENTS)
find_package(LLVM 18.1 CONFIG COMPONENTS)
if (LLVM_FOUND)
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
@ -177,128 +177,13 @@ if (LLVM_FOUND)
include_directories(${LLVM_INCLUDE_DIRS})
add_definitions(${LLVM_DEFINITIONS})
set(TARGET_LIBS_OS "-lLLVM-13 ${LLVM_SYSTEM_LIBS}")
set(TARGET_LIBS_OS "-lLLVM-18 ${LLVM_SYSTEM_LIBS}")
else()
list(APPEND SRC_FILES
X64.cpp
X86.cpp
X86Target.cpp
)
include_directories(h
../extern/llvm-project_18_1_4/llvm/include
../extern/llvm-project_18_1_4/llvm/lib/Target18_1_4
)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
include_directories(
../extern/llvm_linux_18_1_4/include
../extern/llvm_linux_18_1_4/lib/Target/X86
../extern/llvm_linux_18_1_4/lib/Target/AArch64
)
set(LLVM_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_18_1_4/lib")
else()
include_directories(
../extern/llvm_linux_rel_18_1_4/include
../extern/llvm_linux_rel_18_1_4/lib/Target/X86
../extern/llvm_linux_rel_18_1_4/lib/Target/AArch64
)
set(LLVM_LIB "${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_rel_18_1_4/lib")
endif()
execute_process(
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_18_1_4/bin/llvm-config --system-libs --link-static
OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
OUTPUT_STRIP_TRAILING_WHITESPACE
RESULT_VARIABLE EXEC_RESULT
)
if (EXEC_RESULT AND NOT EXEC_RESULT EQUAL 0)
if (EXEC_RESULT MATCHES "^[0-9]+$")
message(FATAL_ERROR "llvm-config exited with code ${EXEC_RESULT}.")
else()
message(FATAL_ERROR "llvm-config couldn't be executed: ${EXEC_RESULT}")
endif()
endif()
message(STATUS "Found LLVM 18.1.4 (local build)")
set(TARGET_LIBS_OS "${LLVM_SYSTEM_LIBS}")
list(APPEND LLVM_LIBS
${LLVM_LIB}/libLLVMCore.a
${LLVM_LIB}/libLLVMCodeGen.a
${LLVM_LIB}/libLLVMMC.a
${LLVM_LIB}/libLLVMMCParser.a
${LLVM_LIB}/libLLVMMCDisassembler.a
${LLVM_LIB}/libLLVMObject.a
${LLVM_LIB}/libLLVMBitReader.a
${LLVM_LIB}/libLLVMAsmParser.a
${LLVM_LIB}/libLLVMTarget.a
${LLVM_LIB}/libLLVMScalarOpts.a
${LLVM_LIB}/libLLVMInstCombine.a
${LLVM_LIB}/libLLVMSelectionDAG.a
${LLVM_LIB}/libLLVMProfileData.a
${LLVM_LIB}/libLLVMAnalysis.a
${LLVM_LIB}/libLLVMAsmPrinter.a
${LLVM_LIB}/libLLVMBitWriter.a
${LLVM_LIB}/libLLVMVectorize.a
${LLVM_LIB}/libLLVMipo.a
${LLVM_LIB}/libLLVMInstrumentation.a
${LLVM_LIB}/libLLVMDebugInfoDWARF.a
${LLVM_LIB}/libLLVMDebugInfoPDB.a
${LLVM_LIB}/libLLVMDebugInfoCodeView.a
${LLVM_LIB}/libLLVMGlobalISel.a
${LLVM_LIB}/libLLVMTransformUtils.a
${LLVM_LIB}/libLLVMBinaryFormat.a
${LLVM_LIB}/libLLVMIRReader.a
${LLVM_LIB}/libLLVMLinker.a
${LLVM_LIB}/libLLVMAggressiveInstCombine.a
${LLVM_LIB}/libLLVMBitstreamReader.a
${LLVM_LIB}/libLLVMCFGuard.a
${LLVM_LIB}/libLLVMTextAPI.a
${LLVM_LIB}/libLLVMRemarks.a
${LLVM_LIB}/libLLVMX86Info.a
${LLVM_LIB}/libLLVMX86Desc.a
${LLVM_LIB}/libLLVMX86CodeGen.a
${LLVM_LIB}/libLLVMX86AsmParser.a
${LLVM_LIB}/libLLVMX86Disassembler.a
${LLVM_LIB}/libLLVMARMDesc.a
${LLVM_LIB}/libLLVMARMUtils.a
${LLVM_LIB}/libLLVMARMInfo.a
${LLVM_LIB}/libLLVMARMCodeGen.a
${LLVM_LIB}/libLLVMARMAsmParser.a
${LLVM_LIB}/libLLVMARMDisassembler.a
${LLVM_LIB}/libLLVMAArch64Desc.a
${LLVM_LIB}/libLLVMAArch64Utils.a
${LLVM_LIB}/libLLVMAArch64Info.a
${LLVM_LIB}/libLLVMAArch64CodeGen.a
${LLVM_LIB}/libLLVMAArch64AsmParser.a
${LLVM_LIB}/libLLVMAArch64Disassembler.a
${LLVM_LIB}/libLLVMWebAssemblyDesc.a
${LLVM_LIB}/libLLVMWebAssemblyInfo.a
${LLVM_LIB}/libLLVMWebAssemblyCodeGen.a
${LLVM_LIB}/libLLVMWebAssemblyAsmParser.a
${LLVM_LIB}/libLLVMWebAssemblyDisassembler.a
${LLVM_LIB}/libLLVMWebAssemblyUtils.a
${LLVM_LIB}/libLLVMSupport.a
${LLVM_LIB}/libLLVMDemangle.a
)
FOREACH (lib ${LLVM_LIBS})
string(APPEND TARGET_LIBS_OS " " ${lib})
ENDFOREACH()
message(FATAL_ERROR "LLVM not found")
endif()
# Add library to build.
add_library(${PROJECT_NAME} SHARED
add_library(${PROJECT_NAME} STATIC
${SRC_FILES}
)

2
IDEHelper/X64.cpp
View file

@ -1113,7 +1113,7 @@ void X64CPU::GetClobbersForMnemonic(const StringImpl& mnemonic, int argCount, Ar
outMayClobberMem = true;
int numImplicits = (int)desc.implicit_defs().size();
auto& impPtr = desc.implicit_defs();
auto impPtr = desc.implicit_defs();
for (int iImp = 0; iImp<numImplicits; ++iImp)
impRegs.Add(impPtr[iImp]);
}