wasi-libc: remove patch-oritented style

faasm · csegarragonz · Feb 27, 2023 · Feb 2, 2023 · Feb 3, 2023 · Feb 6, 2023
commit 09082bcd6cd19221ee6ad046b16c1e27b4b98e7a
diff --git a/docker/cpp-sysroot.dockerfile b/docker/cpp-sysroot.dockerfile
@@ -45,8 +45,6 @@ RUN cd /code/cpp \
         libfaasmpi --native --shared \
     # Install toolchain files
     && inv install \
-    # Patch wasi-libc with the changes required for Faasm
-    && inv llvm.patch-wasi-libc \
     # Build wasi-libc and reset the sysroot. The second call to LLVM just
     # installs some headers that are purged
     && inv llvm.libc --purge llvm \

diff --git a/tasks/llvm.py b/tasks/llvm.py
@@ -74,21 +74,6 @@ def libs(ctx, clean=False):
     )
 
 
-@task()
-def patch_wasi_libc(ctx):
-    """
-    Patch wasi-libc with the changes required for Faasm
-    """
-    patch_dir = join(WASI_LIBC_DIR, "faasm-patches")
-    patches = [
-        "Faasm_switch_on_mman.patch",
-    ]
-
-    for patch in patches:
-        git_cmd = "git apply {}".format(join(patch_dir, patch))
-        run(git_cmd, shell=True, check=True, cwd=WASI_LIBC_DIR)
-
-
 @task()
 def libc(ctx, clean=False, purge=False):
     """

diff --git a/third-party/wasi-libc b/third-party/wasi-libc
+14 −0		dlmalloc/src/dlmalloc.c
+0 −67		faasm-patches/Faasm_switch_on_mman.patch
+9 −0		libc-bottom-half/sources/sbrk.c
+1 −1		libc-top-half/musl/include/sys/mman.h