Merge branch 'develop' into develop

runtimeverification · Oct 18, 2024 · e7827dc · e7827dc
2 parents c700d46 + 7e36761
commit e7827dc
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/deps/haskell-backend_release b/deps/haskell-backend_release
@@ -1 +1 @@
-v0.1.89
+v0.1.90
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,7 @@
   inputs = {
     llvm-backend.url = "github:runtimeverification/llvm-backend/v0.1.100";
     haskell-backend = {
-      url = "github:runtimeverification/haskell-backend/v0.1.89";
+      url = "github:runtimeverification/haskell-backend/v0.1.90";
       inputs.rv-utils.follows = "llvm-backend/rv-utils";
       inputs.nixpkgs.follows = "llvm-backend/nixpkgs";
     };

diff --git a/haskell-backend/src/main/native/haskell-backend b/haskell-backend/src/main/native/haskell-backend
diff --git a/llvm-backend/src/main/java/org/kframework/backend/llvm/LLVMBackend.java b/llvm-backend/src/main/java/org/kframework/backend/llvm/LLVMBackend.java
@@ -146,6 +146,9 @@ private void llvmKompile(String type, String executable) {
       if (options.llvmMutableBytes) {
         args.add("--mutable-bytes");
       }
+      if (options.llvmHiddenVisibility) {
+        args.add("--hidden-visibility");
+      }
 
       if (options.debug) {
         args.add("-g");

diff --git a/llvm-backend/src/main/java/org/kframework/backend/llvm/LLVMKompileOptions.java b/llvm-backend/src/main/java/org/kframework/backend/llvm/LLVMKompileOptions.java
@@ -119,4 +119,10 @@ public List<String> convert(String str) {
       description = "Use a faster, unsound representation for byte arrays on the LLVM backend",
       hidden = true)
   public boolean llvmMutableBytes;
+
+  @Parameter(
+      names = "--llvm-hidden-visibility",
+      description = "Build the llvm backend with -fvisibility=hidden",
+      hidden = true)
+  public boolean llvmHiddenVisibility;
 }