From 694af47e2b3dc8c24dac704f293f4bcf9ab67858 Mon Sep 17 00:00:00 2001
From: neonloop
Date: Mon, 24 Jul 2023 22:07:02 +0000
Subject: Changes funkey-s platform to unix-armv7-hardfloat-neon

More generic platform is supported by more cores, fewer patches needed
to get cores to build. Adding new cores is easier.

unix-armv7-cortexa7-hardfloat-neon causes warnings, maybe SDK bug?

Generic platform may not be as optimized, but speed difference can be
fixed with patches if discovered.
---
 .../snes9x2005_plus/1001-funkey-s-support.patch    | 93 ----------------------
 1 file changed, 93 deletions(-)
 delete mode 100644 patches/snes9x2005_plus/1001-funkey-s-support.patch

(limited to 'patches/snes9x2005_plus')

diff --git a/patches/snes9x2005_plus/1001-funkey-s-support.patch b/patches/snes9x2005_plus/1001-funkey-s-support.patch
deleted file mode 100644
index 1825917..0000000
--- a/patches/snes9x2005_plus/1001-funkey-s-support.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 23b8979..0a09e85 100644
---- a/Makefile
-+++ b/Makefile
-@@ -74,13 +74,46 @@ ifeq ($(platform), unix)
- 	fpic := -fPIC
- 	SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
- 	CFLAGS += -fno-builtin -fno-exceptions -ffunction-sections
--# ARM
-+# (armv7 a7, hard point, neon based) ### 
-+# NESC, SNESC, C64 mini 
-+else ifeq ($(platform), classic_armv7_a7)
-+	TARGET := $(TARGET_NAME)_libretro.so
-+	fpic := -fPIC
-+	SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
-+	CFLAGS += -Ofast \
-+	-flto=4 -fwhole-program -fuse-linker-plugin \
-+	-fdata-sections -ffunction-sections -Wl,--gc-sections \
-+	-fno-stack-protector -fno-ident -fomit-frame-pointer \
-+	-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
-+	-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
-+	-fmerge-all-constants -fno-math-errno \
-+	-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
-+	CC = $(CROSS_COMPILE)gcc
-+	AR = $(CROSS_COMPILE)ar
-+	CXXFLAGS += $(CFLAGS)
-+	CPPFLAGS += $(CFLAGS)
-+	ASFLAGS += $(CFLAGS)
-+	HAVE_NEON = 1
-+	ARCH = arm
-+	BUILTIN_GPU = neon
-+	USE_DYNAREC = 1
-+	ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
-+	  CFLAGS += -march=armv7-a
-+	else
-+	  CFLAGS += -march=armv7ve
-+	  # If gcc is 5.0 or later
-+	  ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1)
-+	    LDFLAGS += -static-libgcc -static-libstdc++
-+	  endif
-+	endif
-+#######################################
-+# generic ARM
- else ifneq (,$(findstring armv,$(platform)))
-        TARGET := $(TARGET_NAME)_libretro.so
-        fpic := -fPIC
-        SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T
--       CC = gcc
--       CXX = g++
-+       CC = $(CROSS_COMPILE)gcc
-+       CXX = $(CROSS_COMPILE)g++
-        PLATFORM_DEFINES += -marm
-        ifneq (,$(findstring softfloat,$(platform)))
-                PLATFORM_DEFINES += -mfloat-abi=softfp
-@@ -306,38 +339,6 @@ else
- endif
- 	OPTIMIZE += -Ofast -DNDEBUG=1
- 
--# (armv7 a7, hard point, neon based) ### 
--# NESC, SNESC, C64 mini 
--else ifeq ($(platform), classic_armv7_a7)
--	TARGET := $(TARGET_NAME)_libretro.so
--	fpic := -fPIC
--	SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
--	CFLAGS += -Ofast \
--	-flto=4 -fwhole-program -fuse-linker-plugin \
--	-fdata-sections -ffunction-sections -Wl,--gc-sections \
--	-fno-stack-protector -fno-ident -fomit-frame-pointer \
--	-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
--	-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
--	-fmerge-all-constants -fno-math-errno \
--	-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
--	CXXFLAGS += $(CFLAGS)
--	CPPFLAGS += $(CFLAGS)
--	ASFLAGS += $(CFLAGS)
--	HAVE_NEON = 1
--	ARCH = arm
--	BUILTIN_GPU = neon
--	USE_DYNAREC = 1
--	ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
--	  CFLAGS += -march=armv7-a
--	else
--	  CFLAGS += -march=armv7ve
--	  # If gcc is 5.0 or later
--	  ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1)
--	    LDFLAGS += -static-libgcc -static-libstdc++
--	  endif
--	endif
--#######################################
--
- # Windows MSVC 2010 x64
- else ifeq ($(platform), windows_msvc2010_x64)
- 	CC  = cl.exe
-- 
cgit v1.2.3