diff --git a/testing/libretro-parallel-n64/APKBUILD b/testing/libretro-parallel-n64/APKBUILD
index 180a3ae53e7..787d5ae1f48 100644
--- a/testing/libretro-parallel-n64/APKBUILD
+++ b/testing/libretro-parallel-n64/APKBUILD
@@ -6,10 +6,13 @@ pkgrel=0
 _commit="0a67445ce63513584d92e5c57ea87efe0da9b3bd"
 pkgdesc="optimized/rewritten Nintendo 64 emulator made specifically for Libretro"
 url="https://github.com/libretro/parallel-n64"
-arch="all !aarch64 !armv7 !armhf !ppc64le !s390x !mips !mips64"
+arch="all !ppc64le !s390x"
 license="GPL-2.0-only"
 makedepends="mesa-dev"
-source="$pkgname-$_commit.tar.gz::https://github.com/libretro/parallel-n64/archive/$_commit.tar.gz"
+source="$pkgname-$_commit.tar.gz::https://github.com/libretro/parallel-n64/archive/$_commit.tar.gz
+	patch-aarch64.patch
+	patch-arm.patch
+	"
 builddir="$srcdir/parallel-n64-$_commit"
 options="!check" # No tests
 
@@ -21,4 +24,10 @@ package() {
 	install -Dm644 parallel_n64_libretro.so "$pkgdir"/usr/lib/libretro/parallel_n64_libretro.so
 }
 
-sha512sums="9ae737e80027ddabe9f91971e912910adaacad0e20ad90e47924e38d0bf8633ee6b0c8cb51598e0da3da5f9f5822226332811ec26bdf91e83d7ad39a39fa89b8  libretro-parallel-n64-0a67445ce63513584d92e5c57ea87efe0da9b3bd.tar.gz"
+sha512sums="
+9ae737e80027ddabe9f91971e912910adaacad0e20ad90e47924e38d0bf8633ee6b0c8cb51598e0da3da5f9f5822226332811ec26bdf91e83d7ad39a39fa89b8  libretro-parallel-n64-0a67445ce63513584d92e5c57ea87efe0da9b3bd.tar.gz
+9d9ab5beb3fc13e5c89d9b8baaaa691a41fab30257d497db3ad85920c06709eb1f31dda091843c236bb61431e5e66c8683b4b9f6ccd6b1be87b3772ac01c07b3  patch-aarch64.patch
+"
+sha512sums="9ae737e80027ddabe9f91971e912910adaacad0e20ad90e47924e38d0bf8633ee6b0c8cb51598e0da3da5f9f5822226332811ec26bdf91e83d7ad39a39fa89b8  libretro-parallel-n64-0a67445ce63513584d92e5c57ea87efe0da9b3bd.tar.gz
+b2e41dc864eefca4cfd62c42371b371dabb28a04c604f3d31185751c87f632371f6d0557ddb7bca32299ce7c0d5908204e3f2afa8fef943b0dbd2a8bd68302af  patch-aarch64.patch
+d5f8abf349b1bff945a0e3f90aabbdbd159b7ddef8054fc284ab192adfa61ce8ccbeac25e14149a5c438db375c8246931ab59a1905adc3e30f217026780a4d7b  patch-arm.patch"
diff --git a/testing/libretro-parallel-n64/patch-aarch64.patch b/testing/libretro-parallel-n64/patch-aarch64.patch
new file mode 100644
index 00000000000..af3274c0f68
--- /dev/null
+++ b/testing/libretro-parallel-n64/patch-aarch64.patch
@@ -0,0 +1,12 @@
+Upstream: https://github.com/libretro/parallel-n64/issues/671
+--- parallel-n64-0a67445ce63513584d92e5c57ea87efe0da9b3bd/mupen64plus-core/src/r4300/new_dynarec/arm64/assem_arm64.h.orig
++++ parallel-n64-0a67445ce63513584d92e5c57ea87efe0da9b3bd/mupen64plus-core/src/r4300/new_dynarec/arm64/assem_arm64.h
+@@ -1,6 +1,8 @@
+ #ifndef M64P_R4300_ASSEM_ARM64_H
+ #define M64P_R4300_ASSEM_ARM64_H
+ 
++#include <sys/types.h>
++
+ #define HOST_REGS 29
+ #define HOST_CCREG 20 /* callee-save */
+ #define HOST_BTREG 19 /* callee-save */
diff --git a/testing/libretro-parallel-n64/patch-arm.patch b/testing/libretro-parallel-n64/patch-arm.patch
new file mode 100644
index 00000000000..f304924dfa3
--- /dev/null
+++ b/testing/libretro-parallel-n64/patch-arm.patch
@@ -0,0 +1,29 @@
+Upstream: https://github.com/libretro/parallel-n64/issues/671
+--- parallel-n64-0a67445ce63513584d92e5c57ea87efe0da9b3bd/Makefile.orig
++++ parallel-n64-0a67445ce63513584d92e5c57ea87efe0da9b3bd/Makefile
+@@ -91,10 +91,12 @@
+ 
+ ifeq ($(ARCH), $(filter $(ARCH), i386 i686))
+    WITH_DYNAREC = x86
+-else ifeq ($(ARCH), $(filter $(ARCH), arm))
+-   WITH_DYNAREC = arm
+ else ifeq ($(ARCH), $(filter $(ARCH), aarch64))
+    WITH_DYNAREC = aarch64
++   CFLAGS += -DARM_FIX
++else ifneq (, $(findstring arm, $(ARCH)))
++   WITH_DYNAREC = arm
++   CFLAGS += -DARM_FIX
+ endif
+ 
+ ifeq ($(HAVE_VULKAN_DEBUG),1)
+--- parallel-n64-0a67445ce63513584d92e5c57ea87efe0da9b3bd/mupen64plus-core/src/r4300/new_dynarec/arm/assem_arm.h.orig
++++ parallel-n64-0a67445ce63513584d92e5c57ea87efe0da9b3bd/mupen64plus-core/src/r4300/new_dynarec/arm/assem_arm.h
+@@ -1,6 +1,8 @@
+ #ifndef M64P_R4300_ASSEM_ARM_H
+ #define M64P_R4300_ASSEM_ARM_H
+ 
++#include <sys/types.h>
++
+ #define HOST_REGS 13
+ #define HOST_CCREG 10
+ #define HOST_BTREG 8