From 6a995bfe10ef172da5c7aa7e95bfd424e893459c Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Sun, 28 Feb 2021 09:45:18 -0500
Subject: [PATCH 1/3] libretro: Sync updates from libretro

---
 libretro/Makefile           | 14 ++++++++++++++
 libretro/jni/Application.mk |  1 +
 libretro/libretro.c         |  1 +
 3 files changed, 16 insertions(+)

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]);
     }
 }

From 975d379d76181adfcc929ad558662288dcb82441 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Sun, 28 Feb 2021 13:13:12 -0500
Subject: [PATCH 2/3] libretro: Remove empty CFLAGS

---
 libretro/Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libretro/Makefile b/libretro/Makefile
index 7e22126..50ab91f 100644
--- a/libretro/Makefile
+++ b/libretro/Makefile
@@ -128,9 +128,6 @@ else ifneq (,$(findstring rpi4_64,$(platform)))
    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)
 ###########################
 
 #######################################

From f21fd33cc38aa7ee948f934d231b65a747eb1b14 Mon Sep 17 00:00:00 2001
From: Rob Loach <robloach@gmail.com>
Date: Sun, 28 Feb 2021 13:13:40 -0500
Subject: [PATCH 3/3] libretro: Remove APP_STL

---
 libretro/jni/Application.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libretro/jni/Application.mk b/libretro/jni/Application.mk
index a169e74..a252a72 100644
--- a/libretro/jni/Application.mk
+++ b/libretro/jni/Application.mk
@@ -1,2 +1 @@
-APP_STL := c++_static
 APP_ABI := all