Mercurial > octave-nkf
diff libinterp/corefcn/pt-jit.h @ 18840:4a4edf0f2077 nkf-ready
fix LLVM 3.4 build (bug #41061)
* configure.ac: Call new functions OCTAVE_LLVM_RAW_FD_OSTREAM_API and
OCTAVE_LLVM_LEGACY_PASSMANAGER_API, check for Verifier.h header file
* m4/acinclude.m4 (OCTAVE_LLVM_RAW_FD_OSTREAM_API): New function to
detect correct raw_fd_ostream API
* m4/acinclude.m4 (OCTAVE_LLVM_LEGACY_PASSMANAGER_API): New function
to detect legacy passmanager API
* libinterp/corefcn/jit-util.h: Use legacy passmanager namespace if
necessary
* libinterp/corefcn/pt-jit.h (class tree_jit): Use legacy passmanager
class if necessary
* libinterp/corefcn/pt-jit.cc: Include appropriate header files
* libinterp/corefcn/pt-jit.cc (tree_jit::initialize): Use legacy
passmanager if necessary
* libinterp/corefcn/pt-jit.cc (tree_jit::optimize): Use correct API
* libinterp/corefcn/jit-typeinfo.cc: Include appropriate header file
author | Stefan Mahr <dac922@gmx.de> |
---|---|
date | Sun, 11 May 2014 02:28:33 +0200 |
parents | 97e49b588f5d |
children | 4197fc428c7d |
line wrap: on
line diff
--- a/libinterp/corefcn/pt-jit.h Sun Mar 16 23:33:49 2014 +0100 +++ b/libinterp/corefcn/pt-jit.h Sun May 11 02:28:33 2014 +0200 @@ -386,8 +386,13 @@ size_t trip_count (const octave_value& bounds) const; llvm::Module *module; +#ifdef LEGACY_PASSMANAGER + llvm::legacy::PassManager *module_pass_manager; + llvm::legacy::FunctionPassManager *pass_manager; +#else llvm::PassManager *module_pass_manager; llvm::FunctionPassManager *pass_manager; +#endif llvm::ExecutionEngine *engine; };