Skip to content

Commit 62a5bae

Browse files
committed
Update to LLVM 19
1 parent 6d7c733 commit 62a5bae

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

expr2/reactor/LLVMJIT.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,7 @@ JITGlobals *JITGlobals::get()
185185

186186
// Retrieve host CPU name and sub-target features and add them to builder.
187187
// Relocation model, code model and codegen opt level are kept to default values.
188-
llvm::StringMap<bool> cpuFeatures;
189-
bool ok = llvm::sys::getHostCPUFeatures(cpuFeatures);
190-
191-
#if defined(__i386__) || defined(__x86_64__) || \
192-
(defined(__linux__) && (defined(__arm__) || defined(__aarch64__)))
193-
ASSERT_MSG(ok, "llvm::sys::getHostCPUFeatures returned false");
194-
#else
195-
(void)ok; // getHostCPUFeatures always returns false on other platforms
196-
#endif
188+
auto cpuFeatures = llvm::sys::getHostCPUFeatures();
197189

198190
for(auto &feature : cpuFeatures)
199191
{

expr2/reactor/LLVMReactor.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "llvm/IR/Intrinsics.h"
2828
#include "llvm/IR/IntrinsicsX86.h"
2929
#include "llvm/IR/LegacyPassManager.h"
30+
#include <llvm/IR/Module.h>
3031
#include "llvm/IR/Verifier.h"
3132
#include "llvm/Support/Alignment.h"
3233
#include "llvm/Support/ManagedStatic.h"

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ if use_asmjit
8787
else
8888
sources = sources_common + sources_expr2
8989
incdir += include_directories('expr2/reactor')
90-
deps += dependency('llvm', version: ['>= 10.0', '< 19'], method: 'config-tool', static: get_option('static-llvm'),
90+
deps += dependency('llvm', version: ['>= 10.0', '< 20'], method: 'config-tool', static: get_option('static-llvm'),
9191
modules: [
9292
'asmprinter', 'executionengine', 'target', 'orcjit', 'native',
9393
])

0 commit comments

Comments
 (0)