M src/platform/psp2/CMakeToolchain.txt → src/platform/psp2/CMakeToolchain.txt

@@ -14,8 +14,8 @@ set(toolchain_dir ${DEVKITARM}/psp2)
 set(toolchain_bin_dir ${toolchain_dir}/bin)
 set(cross_prefix ${DEVKITARM}/bin/arm-none-eabi-)
 set(inc_flags -I${toolchain_dir}/include)
-set(arch_flags "-march=armv7-a -mtune=cortex-a9")
-set(link_flags "-L${toolchain_dir}/lib -specs=psp2.specs ${arch_flags}")
+set(arch_flags "-march=armv7-a -mtune=cortex-a9 -specs=psp2.specs")
+set(link_flags "-L${toolchain_dir}/lib")
 
 set(CMAKE_SYSTEM_NAME Generic CACHE INTERNAL "system name")
 set(CMAKE_SYSTEM_PROCESSOR arm CACHE INTERNAL "processor")

M src/platform/psp2/main.c → src/platform/psp2/main.c

@@ -15,8 +15,8 @@ #include <psp2/ctrl.h>
 #include <psp2/display.h>
 #include <psp2/gxm.h>
 #include <psp2/moduleinfo.h>
-#include <psp2/kernel/memorymgr.h>
 #include <psp2/kernel/processmgr.h>
+#include <psp2/kernel/sysmem.h>
 
 #include <vita2d.h>
 

M src/util/arm-algo.S → src/util/arm-algo.S

@@ -3,7 +3,7 @@ #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#ifdef __ARM_NEON
+#if defined(__ARM_NEON) && !defined(PSP2)
 # r0: Destination
 # r1: Source
 # r2: Number of words to copy as halfwords