diff --git a/games/libretro-beetle_psx/Makefile b/games/libretro-beetle_psx/Makefile
index 51ea9c4f534f..f39260e485cc 100644
--- a/games/libretro-beetle_psx/Makefile
+++ b/games/libretro-beetle_psx/Makefile
@@ -1,27 +1,33 @@
 PORTNAME=	libretro-beetle_psx
 PORTVERSION=	0.20220211
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Standalone port/fork of Mednafen PSX to the Libretro API
 WWW=		https://github.com/libretro/beetle-psx-libretro
 
 LICENSE=	GPLv2
 
 USES=		compiler:c++11-lib gmake gl
 USE_LDCONFIG=	yes
 USE_GL=		gl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libretro
 GH_PROJECT=	beetle-psx-libretro
 GH_TAGNAME=	88929ae
 
 PLIST_FILES=	lib/libretro/mednafen_psx_libretro.so
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH:Marmv?}
+USE_GCC=	yes:build
+.endif
+
 do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro;
 	${INSTALL_LIB} ${WRKSRC}/mednafen_psx_libretro.so ${STAGEDIR}/${PREFIX}/lib/libretro;
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/libretro-beetle_psx/files/patch-deps_lightning_lib_jit__arm-swf.c b/games/libretro-beetle_psx/files/patch-deps_lightning_lib_jit__arm-swf.c
new file mode 100644
index 000000000000..6e2cdfe00c4e
--- /dev/null
+++ b/games/libretro-beetle_psx/files/patch-deps_lightning_lib_jit__arm-swf.c
@@ -0,0 +1,20 @@
+--- deps/lightning/lib/jit_arm-swf.c.orig	2022-11-30 10:43:45 UTC
++++ deps/lightning/lib/jit_arm-swf.c
+@@ -402,7 +402,7 @@ static void _swf_vaarg_d(jit_state_t*, jit_int32_t, ji
+ 	    BICI(rt, rn, encode_arm_immediate(im));			\
+     } while (0)
+ 
+-#if !defined(__GNUC__)
++#if !defined(__GNUC__) || defined(__llvm__)
+ float __addsf3(float u, float v)
+ {
+     return (u + v);
+@@ -414,6 +414,8 @@ __adddf3(double u, double v)
+     return (u + v);
+ }
+ 
++#endif
++#if !defined(__GNUC__)
+ float
+ __aeabi_fsub(float u, float v)
+ {