all repos — mgba @ 0abe9f524db9b1ebeba04109e3463876222809e0

mGBA Game Boy Advance Emulator

PSP2: Fix toolchains and allow building LTO
Jeffrey Pfau jeffrey@endrift.com
Tue, 01 Sep 2015 00:31:57 -0700
commit

0abe9f524db9b1ebeba04109e3463876222809e0

parent

c7d48ab0879fe3739fc5f3f1fd0b189656f7628c

2 files changed, 7 insertions(+), 5 deletions(-)

jump to
M src/platform/psp2/CMakeToolchain.psp2sdk → src/platform/psp2/CMakeToolchain.psp2sdk 
@@ -22,9 +22,10 @@ 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")
+set(CMAKE_SYSTEM_PROCESSOR armv7a- CACHE INTERNAL "processor")
 set(CMAKE_LIBRARY_ARCHITECTURE arm-none-eabi CACHE INTERNAL "abi")
-set(CMAKE_AR ${cross_prefix}ar CACHE INTERNAL "archiver")
+set(CMAKE_AR ${cross_prefix}gcc-ar CACHE INTERNAL "archiver")
+set(CMAKE_RANLIB ${cross_prefix}gcc-ranlib CACHE INTERNAL "ranlib")
 set(CMAKE_C_COMPILER ${cross_prefix}gcc CACHE INTERNAL "c compiler")
 set(CMAKE_CXX_COMPILER ${cross_prefix}g++ CACHE INTERNAL "cxx compiler")
 set(CMAKE_ASM_COMPILER ${cross_prefix}gcc CACHE INTERNAL "assembler")
M src/platform/psp2/CMakeToolchain.vitasdk → src/platform/psp2/CMakeToolchain.vitasdk 
@@ -11,9 +11,10 @@ set(inc_flags -I${toolchain_dir}/include)
 set(link_flags "-L${toolchain_dir}/lib -Wl,-q")
 
 set(CMAKE_SYSTEM_NAME Generic CACHE INTERNAL "system name")
-set(CMAKE_SYSTEM_PROCESSOR arm CACHE INTERNAL "processor")
-set(CMAKE_LIBRARY_ARCHITECTURE arm-none-eabi CACHE INTERNAL "abi")
-set(CMAKE_AR ${cross_prefix}ar CACHE INTERNAL "archiver")
+set(CMAKE_SYSTEM_PROCESSOR armv7-a CACHE INTERNAL "processor")
+set(CMAKE_LIBRARY_ARCHITECTURE arm-vita-eabi CACHE INTERNAL "abi")
+set(CMAKE_AR ${cross_prefix}gcc-ar CACHE INTERNAL "archiver")
+set(CMAKE_RANLIB ${cross_prefix}gcc-ranlib CACHE INTERNAL "ranlib")
 set(CMAKE_C_COMPILER ${cross_prefix}gcc CACHE INTERNAL "c compiler")
 set(CMAKE_CXX_COMPILER ${cross_prefix}g++ CACHE INTERNAL "cxx compiler")
 set(CMAKE_ASM_COMPILER ${cross_prefix}gcc CACHE INTERNAL "assembler")