pin new wamr commit + add .text.wamr_mmap section to linker.ld

flake.nix

@@ -12,7 +12,8 @@ rec {
     flake-utils,
   }:
   # Create a shell (and possibly package) for each possible system, not only x86_64-linux
-    flake-utils.lib.eachDefaultSystem (system: let
+    flake-utils.lib.eachDefaultSystem (
+      system: let
         # =========================================================================================
         # Define pkgs/stdenvs
         # =========================================================================================
@@ -35,18 +36,22 @@ rec {
         };
 
         boost_pkgs =
-        import (builtins.fetchTarball {
+          import
+          (builtins.fetchTarball {
             url = "https://github.com/NixOS/nixpkgs/archive/824421b1796332ad1bcb35bc7855da832c43305f.tar.gz";
             sha256 = "sha256:1w6cjnakz1yi66rs8c6nmhymsr7bj82vs2hz200ipi1sfiq8dy4y";
-        }) {
+          })
+          {
             inherit system;
           };
 
         libdwarf_pkgs =
-        import (builtins.fetchTarball {
+          import
+          (builtins.fetchTarball {
             url = "https://github.com/NixOS/nixpkgs/archive/f597e7e9fcf37d8ed14a12835ede0a7d362314bd.tar.gz";
             sha256 = "sha256:1l79hh7jh7m8yc5mvc8dbg6s8rf30bgm994kf07xriqbzwfn158r";
-        }) {
+          })
+          {
             inherit system;
           };
 
@@ -106,7 +111,7 @@ rec {
             # build-release = "${buildRelease}";
           };
 
-        eraseAbbr = name: value: ''abbr --erase ${name} 2>/dev/null'';
+          eraseAbbr = name: value: "abbr --erase ${name} 2>/dev/null";
           createAbbr = name: value: ''abbr -a ${name} "${value}"'';
 
           # This will be sourced by the global fish config if INIT_PROJECT_SHELL gets unset
@@ -145,13 +150,15 @@ rec {
         # Define custom dependencies
         # ===========================================================================================
 
-      python = pkgs.python314.withPackages (p:
+        python = pkgs.python314.withPackages (
+          p:
             with p; [
               setuptools
               flask
               flask-mysqldb
               pyyaml
-        ]);
+            ]
+        );
 
         # perl = pkgs.perl.withPackages (p:
         #   with p; [
@@ -291,9 +298,13 @@ rec {
           # owner = "christoph.urlacher";
           repo = "wamr";
 
+          # With mmap_space in .text.wamr_mmap
+          rev = "f618cfffaf5ac344fa39abcd16c35278cdacee15";
+          hash = "sha256-nOLQLIVImPoClGWvmqgMFeC8s5MHLzkTSl/M03eQDaA=";
+
           # With fail_marker_group1 in wasm_set_exception_local
-        rev = "177fe78618ce3f74ed497c13ea80e8fbad779e82";
-        hash = "sha256-H+ubCmL1YkI7kG7pYBs1+vpROm0hy2sryi0MWeQO3Bs=";
+          # rev = "177fe78618ce3f74ed497c13ea80e8fbad779e82";
+          # hash = "sha256-H+ubCmL1YkI7kG7pYBs1+vpROm0hy2sryi0MWeQO3Bs=";
 
           # With mmap_space in .text.wamr_aot
           # rev = "cda2009deb85511089b04b0ac736ad4da2d07e58";
@@ -534,5 +545,6 @@ rec {
             LINUX_CXX = "${pkgs.multiStdenv.cc}/bin/g++";
           };
         };
-    });
+      }
+    );
 }

targets/linker.ld

@@ -45,7 +45,12 @@ SECTIONS {
         /* . += 16; /\* padding after data, workaround for import-trace *\/ */
 
         KEEP (*(".text.startup"))
+        *(".text.wamr_aot")
         *(".text*")
+        . = ALIGN(4096);
+        _wamr_mmap_start = .;
+        *(".text.wamr_mmap")
+        _wamr_mmap_end = .;
         *(".rodata*")
     }