From e501391142dcf0765f9bff4e07ecb7d49f9e4b0f Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Fri, 16 Oct 2020 18:23:39 -0400 Subject: [PATCH] Fix Stuff --- Dockerfile.client | 2 +- debian/client/native/usr/lib/minecraft-pi/run.sh | 2 +- debian/client/virgl/usr/lib/minecraft-pi/run.sh | 2 +- mods/src/core.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile.client b/Dockerfile.client index ab90ef452..fecf5312f 100644 --- a/Dockerfile.client +++ b/Dockerfile.client @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM arm64v8/debian:bullseye RUN dpkg --add-architecture armhf diff --git a/debian/client/native/usr/lib/minecraft-pi/run.sh b/debian/client/native/usr/lib/minecraft-pi/run.sh index c637a631d..8b870266c 100644 --- a/debian/client/native/usr/lib/minecraft-pi/run.sh +++ b/debian/client/native/usr/lib/minecraft-pi/run.sh @@ -3,4 +3,4 @@ set -e # Launch Minecraft -${DOCKER_COMPOSE} run --rm minecraft-pi \ No newline at end of file +${DOCKER_COMPOSE} run --rm minecraft-pi \ No newline at end of file diff --git a/debian/client/virgl/usr/lib/minecraft-pi/run.sh b/debian/client/virgl/usr/lib/minecraft-pi/run.sh index d40a68514..ccf0a75fe 100644 --- a/debian/client/virgl/usr/lib/minecraft-pi/run.sh +++ b/debian/client/virgl/usr/lib/minecraft-pi/run.sh @@ -7,7 +7,7 @@ virgl_test_server & VIRGL_PID="$!" # Launch Minecraft -${DOCKER_COMPOSE} run --rm minecraft-pi || : +${DOCKER_COMPOSE} run --rm minecraft-pi || : RET="$?" # Kill VirGL diff --git a/mods/src/core.c b/mods/src/core.c index 52fc76345..64fb2e24a 100644 --- a/mods/src/core.c +++ b/mods/src/core.c @@ -69,7 +69,8 @@ void _patch(const char *file, int line, void *start, unsigned char patch[]) { PATCH_PRINTF(file, line, start, "result"); mprotect((void *) page_start, end - page_start, PROT_READ | PROT_EXEC); - __clear_cache(start, (void *) end); + + __builtin___clear_cache(start, (void *) end); } void _patch_address(const char *file, int line, void *start, void *target) {