Merge pull request #1295 from GaloisInc/update-deps

Update submodule versions.
GaloisInc · May 17, 2021 · 7063225 · 7063225
2 parents 7775bd8 + 650958b
commit 7063225
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 9 deletions.
diff --git a/cabal.GHC-8.10.3.config b/cabal.GHC-8.10.3.config
@@ -195,7 +195,7 @@ constraints: any.Cabal ==3.2.1.0,
              any.logict ==0.7.0.3,
              any.math-functions ==0.3.4.1,
              math-functions +system-erf +system-expm1,
-             any.megaparsec ==9.0.1,
+             any.megaparsec ==8.0.0,
              megaparsec -dev,
              any.memory ==0.15.0,
              memory +support_basement +support_bytestring +support_deepseq +support_foundation,

diff --git a/cabal.GHC-8.6.5.config b/cabal.GHC-8.6.5.config
@@ -196,7 +196,7 @@ constraints: any.Cabal ==2.4.0.1,
              any.logict ==0.7.0.3,
              any.math-functions ==0.3.4.1,
              math-functions +system-erf +system-expm1,
-             any.megaparsec ==9.0.1,
+             any.megaparsec ==8.0.0,
              megaparsec -dev,
              any.memory ==0.15.0,
              memory +support_basement +support_bytestring +support_deepseq +support_foundation,

diff --git a/cabal.GHC-8.8.4.config b/cabal.GHC-8.8.4.config
@@ -196,7 +196,7 @@ constraints: any.Cabal ==3.0.1.0,
              any.logict ==0.7.0.3,
              any.math-functions ==0.3.4.1,
              math-functions +system-erf +system-expm1,
-             any.megaparsec ==9.0.1,
+             any.megaparsec ==8.0.0,
              megaparsec -dev,
              any.memory ==0.15.0,
              memory +support_basement +support_bytestring +support_deepseq +support_foundation,

diff --git a/cabal.project b/cabal.project
@@ -17,9 +17,11 @@ packages:
     deps/cryptol
     deps/what4/what4
     deps/crucible/crucible
+    deps/crucible/crucible-concurrency
     deps/crucible/crucible-jvm
     deps/crucible/crucible-llvm
     deps/crucible/crucible-saw
+    deps/crucible/crucible-syntax
     deps/crucible/crux
     deps/crucible/crux-mir
     deps/parameterized-utils

diff --git a/deps/aig b/deps/aig
diff --git a/deps/crucible b/deps/crucible
diff --git a/deps/elf-edit b/deps/elf-edit
diff --git a/deps/llvm-pretty-bc-parser b/deps/llvm-pretty-bc-parser
diff --git a/deps/macaw b/deps/macaw
diff --git a/deps/parameterized-utils b/deps/parameterized-utils
+1 −2		aig.cabal
+1 −1		src/Data/AIG/Interface.hs
+2 −13		src/Data/AIG/Operations.hs
+2 −1		src/Data/AIG/Trace.hs
+14 −0		.github/update-freeze
+7 −7		.github/workflows/ci.yaml
+96 −0		cabal.project.freeze.ghc-8.10.4
+19 −14		cabal.project.freeze.ghc-8.8.4
+96 −0		cabal.project.freeze.ghc-9.0.1
+169 −171		src/Data/ElfEdit/Dynamic.hs
+2 −2		src/Data/ElfEdit/HighLevel/Types.hs
+3 −2		src/Data/ElfEdit/Prim/Ehdr.hs
+0 −5		stack-8.4.yaml
+0 −5		stack-8.6.yaml
+3 −2		tests/Test.hs
+3 −4		.github/workflows/ci.yaml
+1 −1		base/macaw-base.cabal
+71 −80		base/src/Data/Macaw/Analysis/FunctionArgs.hs
+11 −7		base/src/Data/Macaw/Analysis/RegisterUse.hs
+191 −145		base/src/Data/Macaw/Discovery.hs
+6 −4		base/src/Data/Macaw/Dwarf.hs
+35 −20		base/src/Data/Macaw/Memory/ElfLoader.hs
+2 −4		base/src/Data/Macaw/Utils/IncComp.hs
+1 −1		deps/elf-edit
+295 −295		x86/src/Data/Macaw/X86/ArchTypes.hs
+1 −0		parameterized-utils.cabal
+9 −0		src/Data/Parameterized/Classes.hs
+243 −0		src/Data/Parameterized/TH/GADT.hs
+83 −0		test/Test/TH.hs
+2 −0		test/UnitTest.hs