From 4db0341e0aa9b35e2608bdf3bdd902f71f402ae4 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Wed, 12 Jun 2024 16:46:24 -0400 Subject: [PATCH] Bump submodules to allow building with what4-1.6.* This bumps the `what4` submodule to the 1.6.* version series and updates the `.cabal` files in the `macaw` repo accordingly. Bumping the `what4` submodule also requires bringing in corresponding changes in the `crucible`, `llvm-pretty`, and `llvm-pretty-bc-parser` submodules, so I have done that as well. --- deps/crucible | 2 +- deps/llvm-pretty | 2 +- deps/llvm-pretty-bc-parser | 2 +- deps/what4 | 2 +- macaw-semmc/macaw-semmc.cabal | 2 +- symbolic/macaw-symbolic.cabal | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deps/crucible b/deps/crucible index 459e8db3..f9760bdb 160000 --- a/deps/crucible +++ b/deps/crucible @@ -1 +1 @@ -Subproject commit 459e8db323b164ad48f52fb232a6a3331e99be69 +Subproject commit f9760bdb9921523848efc9889fbd72bd6dea506e diff --git a/deps/llvm-pretty b/deps/llvm-pretty index 94e38484..1fa09fc6 160000 --- a/deps/llvm-pretty +++ b/deps/llvm-pretty @@ -1 +1 @@ -Subproject commit 94e384842b214ba72446d1694446fb5261ab6ce2 +Subproject commit 1fa09fc6ab6d2873b5a631b756fcb259bec349db diff --git a/deps/llvm-pretty-bc-parser b/deps/llvm-pretty-bc-parser index ac9fff49..1cfe6e86 160000 --- a/deps/llvm-pretty-bc-parser +++ b/deps/llvm-pretty-bc-parser @@ -1 +1 @@ -Subproject commit ac9fff49ef1670e58be9ce90075eaa02726f8662 +Subproject commit 1cfe6e86ab802170a531aa646dd6cb6f9f685455 diff --git a/deps/what4 b/deps/what4 index 28744e48..494ac641 160000 --- a/deps/what4 +++ b/deps/what4 @@ -1 +1 @@ -Subproject commit 28744e48e01dc9c35d5aeebb914a9bb425cfe0f1 +Subproject commit 494ac6416ed01eab6ae5d1be427d0aaae4c4bb91 diff --git a/macaw-semmc/macaw-semmc.cabal b/macaw-semmc/macaw-semmc.cabal index 1988c2f9..bfcccd9a 100644 --- a/macaw-semmc/macaw-semmc.cabal +++ b/macaw-semmc/macaw-semmc.cabal @@ -39,7 +39,7 @@ library semmc, bv-sized >= 1 && < 1.1, libBF >= 0.6 && < 0.7, - what4 >= 1.1 && < 1.6 + what4 >= 1.1 && < 1.7 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall -Wcompat diff --git a/symbolic/macaw-symbolic.cabal b/symbolic/macaw-symbolic.cabal index 31843100..dd2f4e22 100644 --- a/symbolic/macaw-symbolic.cabal +++ b/symbolic/macaw-symbolic.cabal @@ -27,7 +27,7 @@ library text, vector, bytestring, - what4 >= 1.1 && < 1.6 + what4 >= 1.1 && < 1.7 hs-source-dirs: src