diff --git a/libretro/Makefile b/libretro/Makefile
index 2ed87b8..7e22126 100644
--- a/libretro/Makefile
+++ b/libretro/Makefile
@@ -119,6 +119,20 @@ else ifeq ($(platform), classic_armv7_a7)
 	    LDFLAGS += -static-libgcc -static-libstdc++
 	  endif
 	endif
+
+###########################
+# Raspberry Pi 4 in 64 mode
+else ifneq (,$(findstring rpi4_64,$(platform)))
+   EXT ?= so
+   TARGET := $(TARGET_NAME)_libretro.$(EXT)
+   fpic := -fPIC
+   SHARED := -shared -Wl,--version-script=$(CORE_DIR)/libretro/link.T -Wl,--no-undefined
+   CFLAGS += -O2 -march=armv8-a+crc+simd -mtune=cortex-a72
+   CXXFLAGS += $(CFLAGS)
+   CPPFLAGS += $(CFLAGS)
+   ASFLAGS += $(CFLAGS)
+###########################
+
 #######################################
 # Nintendo Switch (libtransistor)
 else ifeq ($(platform), switch)
diff --git a/libretro/jni/Application.mk b/libretro/jni/Application.mk
index a252a72..a169e74 100644
--- a/libretro/jni/Application.mk
+++ b/libretro/jni/Application.mk
@@ -1 +1,2 @@
+APP_STL := c++_static
 APP_ABI := all
diff --git a/libretro/libretro.c b/libretro/libretro.c
index 6b531b6..918a657 100644
--- a/libretro/libretro.c
+++ b/libretro/libretro.c
@@ -1128,6 +1128,7 @@ bool retro_load_game(const struct retro_game_info *info)
 void retro_unload_game(void)
 {
     for (int i = 0; i < emulated_devices; i++) {
+        log_cb(RETRO_LOG_INFO, "Unloading GB: %d\n", emulated_devices);
         GB_free(&gameboy[i]);
     }
 }