From 9ca4037ed9180783e6fe4fb58c56cc49a0a28abd Mon Sep 17 00:00:00 2001 From: Florent Castelli Date: Wed, 8 Feb 2017 03:04:30 +0100 Subject: [PATCH] UICommon: Rename HAS_LLVM to HAVE_LLVM --- Source/Core/UICommon/CMakeLists.txt | 2 +- Source/Core/UICommon/Disassembler.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Core/UICommon/CMakeLists.txt b/Source/Core/UICommon/CMakeLists.txt index 77a407d6d1..b76e79a66f 100644 --- a/Source/Core/UICommon/CMakeLists.txt +++ b/Source/Core/UICommon/CMakeLists.txt @@ -13,7 +13,7 @@ if(ENABLE_LLVM) find_package(LLVM CONFIG QUIET) if(LLVM_FOUND) message(STATUS "LLVM found, enabling LLVM support in disassembler") - target_compile_definitions(uicommon PRIVATE HAS_LLVM) + target_compile_definitions(uicommon PRIVATE HAVE_LLVM) target_link_libraries(uicommon PRIVATE ${LLVM_AVAILABLE_LIBS}) target_include_directories(uicommon PRIVATE ${LLVM_INCLUDE_DIRS}) endif() diff --git a/Source/Core/UICommon/Disassembler.cpp b/Source/Core/UICommon/Disassembler.cpp index 6d0a4fb014..14cab2ef9a 100644 --- a/Source/Core/UICommon/Disassembler.cpp +++ b/Source/Core/UICommon/Disassembler.cpp @@ -1,6 +1,6 @@ #include // Bochs -#if defined(HAS_LLVM) +#if defined(HAVE_LLVM) // PowerPC.h defines PC. // This conflicts with a function that has an argument named PC #undef PC @@ -28,7 +28,7 @@ private: u32* host_instructions_count, u64 starting_pc) override; }; -#if defined(HAS_LLVM) +#if defined(HAVE_LLVM) class HostDisassemblerLLVM : public HostDisassembler { public: @@ -153,7 +153,7 @@ std::string HostDisassemblerX86::DisassembleHostBlock(const u8* code_start, cons HostDisassembler* GetNewDisassembler(const std::string& arch) { -#if defined(HAS_LLVM) +#if defined(HAVE_LLVM) if (arch == "x86") return new HostDisassemblerLLVM("x86_64-none-unknown"); else if (arch == "aarch64")