diff options
| author | gatecat <gatecat@ds0.me> | 2021-06-02 10:44:03 +0100 |
|---|---|---|
| committer | gatecat <gatecat@ds0.me> | 2021-06-02 10:44:03 +0100 |
| commit | cbedf52342ce88144e1efc69094f1dadac9b19f1 (patch) | |
| tree | 1e837e6d0db8ae57eb0a5709d986f670f6d19533 /mistral | |
| parent | 2bef7b5f7bf2160c3918e9ab312ec96a1162cc50 (diff) | |
| download | nextpnr-cbedf52342ce88144e1efc69094f1dadac9b19f1.tar.gz nextpnr-cbedf52342ce88144e1efc69094f1dadac9b19f1.tar.bz2 nextpnr-cbedf52342ce88144e1efc69094f1dadac9b19f1.zip | |
mistral: Fix nextpnr build with LLVM
Signed-off-by: gatecat <gatecat@ds0.me>
Diffstat (limited to 'mistral')
| -rw-r--r-- | mistral/arch.h | 2 | ||||
| -rw-r--r-- | mistral/archdefs.h | 2 | ||||
| -rw-r--r-- | mistral/family.cmake | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mistral/arch.h b/mistral/arch.h index 83971822..ee2c84a3 100644 --- a/mistral/arch.h +++ b/mistral/arch.h @@ -289,7 +289,7 @@ struct Arch : BaseArch<ArchRanges> mistral::CycloneV *cyclonev; Arch(ArchArgs args); - ArchArgs archArgs() const { return args; } + ArchArgs archArgs() const override { return args; } std::string getChipName() const override { return args.device; } // ------------------------------------------------- diff --git a/mistral/archdefs.h b/mistral/archdefs.h index 5fd02ad5..60bdcfeb 100644 --- a/mistral/archdefs.h +++ b/mistral/archdefs.h @@ -98,7 +98,7 @@ struct WireId bool is_nextpnr_created() const { NPNR_ASSERT(node != invalid_rnode); - return CycloneV::rn2t(node) >= 128; + return unsigned(CycloneV::rn2t(node)) >= 128; } bool operator==(const WireId &other) const { return node == other.node; } diff --git a/mistral/family.cmake b/mistral/family.cmake index 79681ba8..552c64ae 100644 --- a/mistral/family.cmake +++ b/mistral/family.cmake @@ -2,7 +2,7 @@ set(MISTRAL_ROOT "" CACHE STRING "Mistral install path") aux_source_directory(${MISTRAL_ROOT}/lib MISTRAL_LIB_FILES) add_library(mistral STATIC ${MISTRAL_LIB_FILES}) -target_compile_options(mistral PRIVATE -Wno-maybe-uninitialized) +target_compile_options(mistral PRIVATE -Wno-maybe-uninitialized -Wno-uninitialized -Wno-unknown-warning-option) find_package(LibLZMA REQUIRED) @@ -10,5 +10,5 @@ foreach(family_target ${family_targets}) target_include_directories(${family_target} PRIVATE ${MISTRAL_ROOT}/lib ${LIBLZMA_INCLUDE_DIRS}) target_link_libraries(${family_target} PRIVATE mistral ${LIBLZMA_LIBRARIES}) # Currently required to avoid issues with mistral (LTO means the warnings can end up in nextpnr) - target_link_options(${family_target} PRIVATE -Wno-maybe-uninitialized) + target_link_options(${family_target} PRIVATE -Wno-maybe-uninitialized -Wno-uninitialized -Wno-unknown-warning-option) endforeach() |