diff options
| author | Martin Nowack <m.nowack@imperial.ac.uk> | 2020-01-23 15:28:56 +0000 |
|---|---|---|
| committer | Cristian Cadar <c.cadar@imperial.ac.uk> | 2020-02-13 17:39:21 +0000 |
| commit | 2e8d6aed747a988871b6836012301708950a74ef (patch) | |
| tree | 35ac617795950d9d23672fdec50a6d78dba31d3e /scripts/build/patches/llvm50.patch | |
| parent | dbda156217c532a7e1a65e8c216e593a64c0b8fc (diff) | |
| download | klee-2e8d6aed747a988871b6836012301708950a74ef.tar.gz | |
Use git repository to build LLVM
LLVM changed from svn to github. Use the github mirror to have faster build times. Patches were updated to follow the new structure. Patches also support building underr Ubuntu 18.04
Diffstat (limited to 'scripts/build/patches/llvm50.patch')
| -rw-r--r-- | scripts/build/patches/llvm50.patch | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/scripts/build/patches/llvm50.patch b/scripts/build/patches/llvm50.patch index f10a47c7..d6ce652b 100644 --- a/scripts/build/patches/llvm50.patch +++ b/scripts/build/patches/llvm50.patch @@ -1,11 +1,24 @@ ---- include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h -+++ include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h +--- a/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h ++++ b/llvm/include/llvm/ExecutionEngine/Orc/OrcRemoteTargetClient.h @@ -713,7 +713,7 @@ private: - + uint32_t getTrampolineSize() const { return RemoteTrampolineSize; } - + - Expected<std::vector<char>> readMem(char *Dst, JITTargetAddress Src, + Expected<std::vector<unsigned char>> readMem(char *Dst, JITTargetAddress Src, uint64_t Size) { // Check for an 'out-of-band' error, e.g. from an MM destructor. if (ExistingError) +--- a/llvm/tools/llvm-shlib/CMakeLists.txt ++++ b/llvm/tools/llvm-shlib/CMakeLists.txt +@@ -36,7 +36,10 @@ endif() + + add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES}) + ++if(LIB_NAMES) + list(REMOVE_DUPLICATES LIB_NAMES) ++endif() ++ + if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")) # FIXME: It should be "GNU ld for elf" + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/simple_version_script.map.in |