From 37e2bf5daaac7cae88875b738aafb96f189bd9ff Mon Sep 17 00:00:00 2001 From: Ryan 'Swingflip' Hamlin Date: Wed, 31 Oct 2018 20:58:26 +0000 Subject: [PATCH 1/9] added echo A7A7 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 579ef03c..8364d8cf 100644 --- a/Makefile +++ b/Makefile @@ -203,11 +203,13 @@ clean: $(RM) -r .opk_data $(TARGET): $(OBJS) + @echo "** BUILDING $(TARGET) FOR PLATFORM $(platform) **" ifeq ($(STATIC_LINKING), 1) $(AR) rcs $@ $(OBJS) else $(LD) $(LINKOUT)$@ $^ $(LDFLAGS) $(LDLIBS) endif + @echo "** BUILD SUCCESSFUL! GG NO RE **" pprof: platform/linux/pprof.c $(CC) -O2 -ggdb -DPPROF -DPPROF_TOOL -I../../ -I. $^ -o $@ From be7d54a6c69caad90cf6fbe245a0203bc46258d8 Mon Sep 17 00:00:00 2001 From: Ryan 'Swingflip' Hamlin Date: Wed, 31 Oct 2018 21:10:21 +0000 Subject: [PATCH 2/9] Added A7A7 --- Makefile.libretro | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/Makefile.libretro b/Makefile.libretro index 3beb1e7e..fcd8b3bf 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -411,6 +411,38 @@ else ifeq ($(platform), qnx) use_cz80 = 1 use_sh2drc = 1 use_svpdrc = 1 + +# (armv7 a7, hard point, neon based) ### +# NESC, SNESC, C64 mini +else ifeq ($(platform), classic_armv7_a7) + TARGET := $(TARGET_NAME).so #Good consistency here... + fpic := -fPIC + SHARED := -shared -Wl,--no-undefined,-Bsymbolic + 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 +####################################### # ARM else ifneq (,$(findstring armv,$(platform))) From 7789ffae142696289fb123937175b7c765cb9867 Mon Sep 17 00:00:00 2001 From: Ryan 'Swingflip' Hamlin Date: Wed, 31 Oct 2018 21:20:02 +0000 Subject: [PATCH 3/9] Update .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index b27d2a16..26e47acb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = git://notaz.gp2x.de/~notaz/libpicofe.git [submodule "cpu/cyclone"] path = cpu/cyclone - url = git://notaz.gp2x.de/~notaz/cyclone68000.git + url = git://github.com/notaz/cyclone68000.git From 6d2b28894d42cf59b95589dbf92a80837dcd9912 Mon Sep 17 00:00:00 2001 From: Ryan 'Swingflip' Hamlin Date: Wed, 31 Oct 2018 21:22:45 +0000 Subject: [PATCH 4/9] Fixed Git sub modules as they moved over to github --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 26e47acb..fb8dc79a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "platform/libpicofe"] path = platform/libpicofe - url = git://notaz.gp2x.de/~notaz/libpicofe.git + url = git://github.com/notaz/libpicofe [submodule "cpu/cyclone"] path = cpu/cyclone url = git://github.com/notaz/cyclone68000.git From bae54ec99851da1304981c07211fb21acd4d892a Mon Sep 17 00:00:00 2001 From: Ryan 'Swingflip' Hamlin Date: Wed, 31 Oct 2018 21:27:12 +0000 Subject: [PATCH 5/9] Update .gitmodules --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index fb8dc79a..b27d2a16 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "platform/libpicofe"] path = platform/libpicofe - url = git://github.com/notaz/libpicofe + url = git://notaz.gp2x.de/~notaz/libpicofe.git [submodule "cpu/cyclone"] path = cpu/cyclone - url = git://github.com/notaz/cyclone68000.git + url = git://notaz.gp2x.de/~notaz/cyclone68000.git From 495ae716972a3af1fe6e446b064ee1a98f9f5d5b Mon Sep 17 00:00:00 2001 From: Ryan 'Swingflip' Hamlin Date: Thu, 1 Nov 2018 12:09:51 +0000 Subject: [PATCH 6/9] Fixed A7A7 --- Makefile.libretro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.libretro b/Makefile.libretro index fcd8b3bf..b57957d6 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -415,7 +415,7 @@ else ifeq ($(platform), qnx) # (armv7 a7, hard point, neon based) ### # NESC, SNESC, C64 mini else ifeq ($(platform), classic_armv7_a7) - TARGET := $(TARGET_NAME).so #Good consistency here... + TARGET := $(TARGET_NAME)_libretro.so fpic := -fPIC SHARED := -shared -Wl,--no-undefined,-Bsymbolic CFLAGS += -Ofast \ From c96b9e687b521b774b917e16720251e785750581 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Sat, 2 Mar 2019 11:12:26 -0500 Subject: [PATCH 7/9] added a8a35 --- Makefile.libretro | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Makefile.libretro b/Makefile.libretro index 213c9bd5..c9074683 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -470,6 +470,37 @@ else ifeq ($(platform), classic_armv7_a7) LDFLAGS += -static-libgcc -static-libstdc++ endif endif + +# (armv8 a35, hard point, neon based) ### +# Playstation Classic +else ifeq ($(platform), classic_armv8_a35) + TARGET := $(TARGET_NAME)_libretro.so + fpic := -fPIC + SHARED := -shared -Wl,--no-undefined,-Bsymbolic + 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-a35 -mfpu=neon-fp-armv8 -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=armv8-a + else + CFLAGS += -march=armv8-a + # If gcc is 5.0 or later + ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1) + LDFLAGS += -static-libgcc -static-libstdc++ + endif + endif ####################################### # ARM From 0352b55166dcb48f80f4d4561796f52f683b3639 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Sun, 2 Jun 2019 11:18:16 -0400 Subject: [PATCH 8/9] cleaned up a8a35 --- Makefile.libretro | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index c9074683..0de07924 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -492,15 +492,9 @@ else ifeq ($(platform), classic_armv8_a35) ARCH = arm BUILTIN_GPU = neon USE_DYNAREC = 1 - ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1) CFLAGS += -march=armv8-a - else - CFLAGS += -march=armv8-a - # If gcc is 5.0 or later - ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1) - LDFLAGS += -static-libgcc -static-libstdc++ - endif - endif + LDFLAGS += -static-libgcc -static-libstdc++ + ####################################### # ARM From 10a97af87895af9a8bfa3118918f6f022faf5d14 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Sun, 2 Jun 2019 11:20:19 -0400 Subject: [PATCH 9/9] Update Makefile --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8364d8cf..6625becb 100644 --- a/Makefile +++ b/Makefile @@ -203,13 +203,12 @@ clean: $(RM) -r .opk_data $(TARGET): $(OBJS) - @echo "** BUILDING $(TARGET) FOR PLATFORM $(platform) **" + ifeq ($(STATIC_LINKING), 1) $(AR) rcs $@ $(OBJS) else $(LD) $(LINKOUT)$@ $^ $(LDFLAGS) $(LDLIBS) endif - @echo "** BUILD SUCCESSFUL! GG NO RE **" pprof: platform/linux/pprof.c $(CC) -O2 -ggdb -DPPROF -DPPROF_TOOL -I../../ -I. $^ -o $@