RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 18:54:02 +01:00
Code Issues Projects Releases Wiki Activity

Accidently merged an incomplete upstream patch in 10e6ee563a6b5ca498f27972ca6dbe6c308f1ac2 - reverting the changes.

Browse Source 
llvm-svn: 316359
This commit is contained in:
Mitch Phillips 2017-10-23 18:17:56 +00:00
parent 3681e12756
commit 49b4d6538e
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/llvm-cfi-verify/CMakeLists.txt
View File

@ -4,7 +4,6 @@ set(LLVM_LINK_COMPONENTS
AllTargetsDescs AllTargetsDescs
AllTargetsDisassemblers AllTargetsDisassemblers
AllTargetsInfos AllTargetsInfos
CFIVerify
MC MC
MCParser MCParser
Object Object
@ -12,6 +11,8 @@ set(LLVM_LINK_COMPONENTS
) )
add_llvm_tool(llvm-cfi-verify add_llvm_tool(llvm-cfi-verify
llvm-cfi-verify.cpp) llvm-cfi-verify.cpp
lib/FileAnalysis.cpp
)
add_subdirectory(lib) add_subdirectory(lib)

4
tools/llvm-cfi-verify/lib/CMakeLists.txt
View File

@ -1,9 +1,7 @@
add_library(LLVMCFIVerify add_library(LLVMCFIVerify
STATIC STATIC
FileAnalysis.cpp FileAnalysis.cpp
FileAnalysis.h FileAnalysis.h)
GraphBuilder.cpp
GraphBuilder.h)
llvm_update_compile_flags(LLVMCFIVerify) llvm_update_compile_flags(LLVMCFIVerify)
llvm_map_components_to_libnames(libs llvm_map_components_to_libnames(libs

3
tools/llvm-cfi-verify/lib/FileAnalysis.h
View File

@ -10,7 +10,6 @@
#ifndef LLVM_CFI_VERIFY_FILE_ANALYSIS_H #ifndef LLVM_CFI_VERIFY_FILE_ANALYSIS_H
#define LLVM_CFI_VERIFY_FILE_ANALYSIS_H #define LLVM_CFI_VERIFY_FILE_ANALYSIS_H
#include "llvm/ADT/DenseMap.h"
#include "llvm/BinaryFormat/ELF.h" #include "llvm/BinaryFormat/ELF.h"
#include "llvm/MC/MCAsmInfo.h" #include "llvm/MC/MCAsmInfo.h"
#include "llvm/MC/MCContext.h" #include "llvm/MC/MCContext.h"
@ -162,7 +161,7 @@ private:
// Contains a mapping between a specific address, and a list of instructions // Contains a mapping between a specific address, and a list of instructions
// that use this address as a branch target (including call instructions). // that use this address as a branch target (including call instructions).
DenseMap<uint64_t, std::vector<uint64_t>> StaticBranchTargetings; std::unordered_map<uint64_t, std::vector<uint64_t>> StaticBranchTargetings;
// A list of addresses of indirect control flow instructions. // A list of addresses of indirect control flow instructions.
std::set<uint64_t> IndirectInstructions; std::set<uint64_t> IndirectInstructions;

5
unittests/tools/llvm-cfi-verify/CMakeLists.txt
View File

@ -4,7 +4,6 @@ set(LLVM_LINK_COMPONENTS
AllTargetsDescs AllTargetsDescs
AllTargetsDisassemblers AllTargetsDisassemblers
AllTargetsInfos AllTargetsInfos
CFIVerify
MC MC
MCParser MCParser
Object Object
@ -14,6 +13,6 @@ set(LLVM_LINK_COMPONENTS
list(FIND LLVM_TARGETS_TO_BUILD "X86" x86_idx) list(FIND LLVM_TARGETS_TO_BUILD "X86" x86_idx)
if (NOT x86_idx LESS 0) if (NOT x86_idx LESS 0)
add_llvm_unittest(CFIVerifyTests add_llvm_unittest(CFIVerifyTests
FileAnalysis.cpp FileAnalysis.cpp)
GraphBuilder.cpp) target_link_libraries(CFIVerifyTests LLVMCFIVerify)
endif() endif()