123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657 |
- From 75c152599a7c1739e6dadcdb9b377acf7e44d9cf Mon Sep 17 00:00:00 2001
- From: Jan Beich <jbeich@FreeBSD.org>
- Date: Wed, 30 Jan 2019 12:42:34 +0000
- Subject: [PATCH] lang/beignet: unbreak with llvm80
- Regressed by https://github.com/llvm/llvm-project/commit/721d95713a9e
- unable to load /usr/local/lib/beignet//libgbeinterp.so which is part of the driver, please check!
- ld-elf.so.1: /usr/local/lib/beignet//libgbeinterp.so: Undefined symbol "_ZN4llvm24DisableABIBreakingChecksE"
- Regressed by https://github.com/llvm/llvm-project/commit/4a2d58e16acc
- backend/src/llvm/llvm_gen_backend.cpp:3076:5: error:
- unknown type name 'TerminatorInst'
- TerminatorInst *term = bb->getTerminator();
- ^
- backend/src/llvm/llvm_gen_backend.cpp:3083:5: error:
- unknown type name 'TerminatorInst'
- TerminatorInst *term = bb->getTerminator();
- ^
- --- a/backend/src/CMakeLists.txt
- +++ b/backend/src/CMakeLists.txt
- @@ -168,6 +168,7 @@ add_dependencies(gbe beignet_bitcode)
- endif (NOT (USE_STANDALONE_GBE_COMPILER STREQUAL "true"))
-
- add_library(gbeinterp SHARED gbe_bin_interpreter.cpp)
- +target_link_libraries(gbeinterp ${LLVM_MODULE_LIBS})
-
- if (LLVM_VERSION_NODOT VERSION_EQUAL 34)
- find_library(TERMINFO NAMES tinfo ncurses)
- --- a/backend/src/llvm/llvm_gen_backend.cpp
- +++ b/backend/src/llvm/llvm_gen_backend.cpp
- @@ -3073,14 +3073,22 @@ namespace gbe
-
-
- static unsigned getChildNo(BasicBlock *bb) {
- +#if LLVM_VERSION_MAJOR < 8
- TerminatorInst *term = bb->getTerminator();
- +#else
- + Instruction *term = bb->getTerminator();
- +#endif
- return term->getNumSuccessors();
- }
-
- // return NULL if index out-range of children number
- static BasicBlock *getChildPossible(BasicBlock *bb, unsigned index) {
-
- +#if LLVM_VERSION_MAJOR < 8
- TerminatorInst *term = bb->getTerminator();
- +#else
- + Instruction *term = bb->getTerminator();
- +#endif
- unsigned childNo = term->getNumSuccessors();
- BasicBlock *child = NULL;
- if(index < childNo) {
|