Merge pull request #88 from fewtarius/dev

64bit pcsx_rearmed
This commit is contained in:
fewtarius 2022-04-20 12:28:50 -04:00 committed by GitHub
commit d579277373
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 44 additions and 66 deletions

View file

@ -2,8 +2,7 @@
# Copyright (C) 2020 Trond Haugland (trondah@gmail.com)
PKG_NAME="pcsx_rearmed"
PKG_VERSION="e24732050e902bd5402b2b7da7c391d2ca8fa799"
PKG_SHA256="96b933eb2877ff224b3b00af0e9f4f3560d3d0b1c0bb18f67060e7e5598c1757"
PKG_VERSION="46a38bdab1a4d9f578a368705a9e3e144fd81189"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"
@ -14,31 +13,17 @@ PKG_SHORTDESC="ARM optimized PCSX fork"
PKG_TOOLCHAIN="manual"
PKG_PATCH_DIRS+="${DEVICE}"
if [ "${ARCH}" = "arm" ]
then
make_target() {
cd ${PKG_BUILD}
if [[ "${DEVICE}" =~ RG351 ]]
then
make -f Makefile.libretro GIT_VERSION=${PKG_VERSION} platform=RG351x
else
make -f Makefile.libretro GIT_VERSION=${PKG_VERSION} platform=${DEVICE}
fi
}
else
make_target() {
:
}
fi
makeinstall_target() {
INSTALLTO="/usr/lib/libretro/"
mkdir -p ${INSTALL}${INSTALLTO}
make_target() {
cd ${PKG_BUILD}
if [ "${ARCH}" = "aarch64" ]; then
cp -vP ${PKG_BUILD}/../../build.${DISTRO}-${DEVICE}.arm/pcsx_rearmed-*/.install_pkg/usr/lib/libretro/pcsx_rearmed_libretro.so ${INSTALL}${INSTALLTO}
if [[ "${DEVICE}" =~ RG351 ]]
then
make -f Makefile.libretro GIT_VERSION=${PKG_VERSION} platform=RG351x
else
cp pcsx_rearmed_libretro.so ${INSTALL}${INSTALLTO}
make -f Makefile.libretro GIT_VERSION=${PKG_VERSION} platform=${DEVICE}
fi
}
makeinstall_target() {
mkdir -p $INSTALL/usr/lib/libretro
cp pcsx_rearmed_libretro.so $INSTALL/usr/lib/libretro/
}

View file

@ -1,24 +1,19 @@
diff -rupN pcsx_rearmed.orig/Makefile.libretro pcsx_rearmed/Makefile.libretro
--- pcsx_rearmed.orig/Makefile.libretro 2022-03-22 22:45:18.406511156 +0000
+++ pcsx_rearmed/Makefile.libretro 2022-03-23 00:58:28.073644000 +0000
@@ -362,6 +362,19 @@ else ifeq ($(platform), rpi4_64)
DYNAREC = ari64
fpic := -fPIC
CFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a72 -ftree-vectorize
+
+#######################################
+# Anbernic RG351x
--- pcsx_rearmed.orig/Makefile.libretro 2022-04-20 07:57:13.327886544 -0400
+++ pcsx_rearmed/Makefile.libretro 2022-04-20 08:01:22.194100092 -0400
@@ -70,6 +70,15 @@ else ifneq (,$(findstring CortexA73_G12B
CFLAGS += -fomit-frame-pointer -ffast-math -DARM
CPUFLAGS += -march=armv8-a+crc -mfpu=neon-fp-armv8 -mcpu=cortex-a73 -mtune=cortex-a73.cortex-a53
+else ifeq ($(platform), RG351x)
+ TARGET := $(TARGET_NAME)_libretro.so
+ CFLAGS += -marm -mtune=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard
+ ASFLAGS += -mtune=cortex-a35 -mfpu=neon-fp-armv8 -mfloat-abi=hard
+ fpic := -fPIC
+ HAVE_NEON = 1
+ ARCH = arm
+ BUILTIN_GPU = neon
+ DYNAREC = ari64
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ SHARED := -shared -Wl,-version-script=link.T
+ ARCH = arm64
+ DYNAREC = ari64
+ CFLAGS += -fomit-frame-pointer -ffast-math -Ofast -DARM
+ CPUFLAGS += -march=armv8-a+crc -mcpu=cortex-a35 -mtune=cortex-a35
+
# Classic Platforms ####################
# Platform affix = classic_<ISA>_<µARCH>
# ALLWINNER H5
else ifneq (,$(findstring h5,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so

View file

@ -1,21 +1,19 @@
diff -rupN pcsx_rearmed.orig/Makefile.libretro pcsx_rearmed/Makefile.libretro
--- pcsx_rearmed.orig/Makefile.libretro 2022-04-03 01:27:52.509284300 +0200
+++ pcsx_rearmed/Makefile.libretro 2022-04-03 01:28:38.192433888 +0200
@@ -363,6 +363,17 @@ else ifeq ($(platform), rpi4_64)
fpic := -fPIC
CFLAGS += -march=armv8-a+crc+simd -mtune=cortex-a72 -ftree-vectorize
+# RG552 (32 bit)
--- pcsx_rearmed.orig/Makefile.libretro 2022-04-20 07:57:13.327886544 -0400
+++ pcsx_rearmed/Makefile.libretro 2022-04-20 07:59:40.302828388 -0400
@@ -70,6 +70,15 @@ else ifneq (,$(findstring CortexA73_G12B
CFLAGS += -fomit-frame-pointer -ffast-math -DARM
CPUFLAGS += -march=armv8-a+crc -mfpu=neon-fp-armv8 -mcpu=cortex-a73 -mtune=cortex-a73.cortex-a53
+else ifeq ($(platform), RG552)
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ CFLAGS += -march=armv8-a -marm -mfpu=neon-fp-armv8 -mfloat-abi=hard
+ HAVE_NEON = 1
+ ARCH = arm
+ BUILTIN_GPU = neon
+ DYNAREC = ari64
+ LDFLAGS += -static-libgcc -static-libstdc++ -fPIC
+ TARGET := $(TARGET_NAME)_libretro.so
+ fpic := -fPIC
+ SHARED := -shared -Wl,-version-script=link.T
+ ARCH = arm64
+ DYNAREC = ari64
+ CFLAGS += -fomit-frame-pointer -ffast-math -Ofast -DARM
+ CPUFLAGS += -march=armv8-a+crc -mcpu=cortex-a72 -mtune=cortex-a72.cortex-a53
+
# Classic Platforms ####################
# Platform affix = classic_<ISA>_<µARCH>
# Help at https://modmyclassic.com/comp
# ALLWINNER H5
else ifneq (,$(findstring h5,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so

View file

@ -4,6 +4,6 @@
PKG_NAME="arm32"
PKG_LICENSE="GPL"
PKG_SITE="www.jelos.org"
PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware libusb unzip socat p7zip file ${OPENGLES} SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf libgo2 retroarch pcsx_rearmed parallel-n64_rice parallel-n64_gln64 parallel-n64_glide64 gpsp"
PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware libusb unzip socat p7zip file ${OPENGLES} SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf libgo2 retroarch parallel-n64_rice parallel-n64_gln64 parallel-n64_glide64 gpsp"
PKG_SECTION="virtual"
PKG_LONGDESC="Root package used to build and create 32-bit userland"