christoph/wamr
1
Fork 0
Code Releases Activity

Fix wamrc build issues with LLVM 13 and LLVM 16 (#2313)

Browse Source 
Fix some build errors when building wamrc with LLVM-13, reported in #2311
Fix some build warnings when building wamrc with LLVM-16:
```
  core/iwasm/compilation/aot_llvm_extra2.cpp:26:26: warning:
  ‘llvm::None’ is deprecated: Use std::nullopt instead. [-Wdeprecated-declarations]
     26 |             return llvm::None;
```
Fix a maybe-uninitialized compile warning:
```
  core/iwasm/compilation/aot_llvm.c:413:9: warning:
  ‘update_top_block’ may be used uninitialized in this function [-Wmaybe-uninitialized]
    413 |         LLVMPositionBuilderAtEnd(b, update_top_block);
```
This commit is contained in:
Wenyong Huang
2023-06-27 08:59:49 +08:00
committed by GitHub
parent f5c5a83331
commit ea78b89965
4 changed files with 69 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/iwasm/compilation/aot_llvm_extra2.cpp
View File

@ -23,7 +23,11 @@ convert(LLVMRelocMode reloc_mode)
{
switch (reloc_mode) {
case LLVMRelocDefault:
#if LLVM_VERSION_MAJOR >= 16
return std::nullopt;
#else
return llvm::None;
#endif
case LLVMRelocStatic:
return llvm::Reloc::Static;
case LLVMRelocPIC:
@ -38,7 +42,11 @@ convert(LLVMRelocMode reloc_mode)
return llvm::Reloc::ROPI_RWPI;
}
bh_assert(0);
#if LLVM_VERSION_MAJOR >= 16
return std::nullopt;
#else
return llvm::None;
#endif
}
static llvm::CodeGenOpt::Level
@ -64,10 +72,18 @@ convert(LLVMCodeModel code_model, bool *jit)
*jit = false;
switch (code_model) {
case LLVMCodeModelDefault:
#if LLVM_VERSION_MAJOR >= 16
return std::nullopt;
#else
return llvm::None;
#endif
case LLVMCodeModelJITDefault:
*jit = true;
#if LLVM_VERSION_MAJOR >= 16
return std::nullopt;
#else
return llvm::None;
#endif
case LLVMCodeModelTiny:
return llvm::CodeModel::Tiny;
case LLVMCodeModelSmall:
@ -80,7 +96,11 @@ convert(LLVMCodeModel code_model, bool *jit)
return llvm::CodeModel::Large;
}
bh_assert(0);
#if LLVM_VERSION_MAJOR >= 16
return std::nullopt;
#else
return llvm::None;
#endif
}
LLVMTargetMachineRef