Skip to content

Commit 10eda75

Browse files
authored
Merge pull request #137 from siv2r/change-llvm-version
changed required llvm version in llvm_loader
2 parents 1fb6f98 + 661bb48 commit 10eda75

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

source/loaders/llvm_loader/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ endif()
77
# External dependencies
88
#
99

10-
find_package(LLVM 11.0.1 REQUIRED)
10+
find_package(LLVM 11 REQUIRED)
1111

1212
#
1313
# Plugin name and options

source/loaders/llvm_loader/source/llvm_loader_impl.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,22 @@
6565
#pragma GCC diagnostic pop
6666
#endif
6767

68-
using namespace llvm;
69-
using namespace std;
70-
71-
using llvm::ArrayRef;
72-
using llvm::EngineBuilder;
73-
using llvm::ExecutionEngine;
74-
using llvm::Function;
75-
using llvm::GenericValue;
76-
using llvm::LLVMContext;
77-
using llvm::Module;
78-
using llvm::parseIRFile;
79-
using llvm::SMDiagnostic;
80-
using llvm::StringRef;
81-
using std::cout;
82-
using std::endl;
83-
using std::unique_ptr;
68+
// using namespace llvm;
69+
// using namespace std;
70+
71+
// using llvm::ArrayRef;
72+
// using llvm::EngineBuilder;
73+
// using llvm::ExecutionEngine;
74+
// using llvm::Function;
75+
// using llvm::GenericValue;
76+
// using llvm::LLVMContext;
77+
// using llvm::Module;
78+
// using llvm::parseIRFile;
79+
// using llvm::SMDiagnostic;
80+
// using llvm::StringRef;
81+
// using std::cout;
82+
// using std::endl;
83+
// using std::unique_ptr;
8484

8585
typedef struct loader_impl_llvm_function_type
8686
{
@@ -100,8 +100,8 @@ typedef struct loader_impl_llvm_handle_type
100100
typedef struct loader_impl_llvm_type
101101
{
102102
// TODO: The reference to LLVM interpreter must be stored here (Is this correct?)
103-
LLVMContext context;
104-
SMDiagnostic error;
103+
llvm::LLVMContext context;
104+
llvm::SMDiagnostic error;
105105

106106
} * loader_impl_llvm;
107107

@@ -344,7 +344,7 @@ loader_handle llvm_loader_impl_load_from_package(loader_impl impl, const loader_
344344
/* TODO */
345345
// The same as load_from_file but this should load from binary format instead of readable format (input.ll)
346346

347-
(void)impl;
347+
(void)llvm_impl;
348348
(void)path;
349349

350350
// TODO: Return here the pointer to loader_impl_llvm_handle_type

0 commit comments

Comments
 (0)