github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-08 04:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

dep/vixl: Fix building for AArch32

Browse Source
This commit is contained in:
Connor McLaughlin 2020-11-21 01:52:13 +10:00
parent 125d104df4
commit 302b08023e
10 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -194,8 +194,8 @@ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86" OR ${CMAKE_SYSTEM_PROCESSOR} STR
set(CPU_ARCH "x86") set(CPU_ARCH "x86")
elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
set(CPU_ARCH "aarch64") set(CPU_ARCH "aarch64")
elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7-a") elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7-a" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
set(CPU_ARCH "arm") set(CPU_ARCH "aarch32")
else() else()
message(FATAL_ERROR "Unknown system processor: " ${CMAKE_SYSTEM_PROCESSOR}) message(FATAL_ERROR "Unknown system processor: " ${CMAKE_SYSTEM_PROCESSOR})
endif() endif()

2
dep/CMakeLists.txt
View File

@ -31,7 +31,7 @@ if(BUILD_LIBRETRO_CORE)
add_subdirectory(libretro-common) add_subdirectory(libretro-common)
endif() endif()
if(${CPU_ARCH} STREQUAL "aarch64") if(${CPU_ARCH} STREQUAL "aarch32" OR ${CPU_ARCH} STREQUAL "aarch64")
add_subdirectory(vixl) add_subdirectory(vixl)
endif() endif()

6
dep/vixl/CMakeLists.txt
View File

@ -27,7 +27,7 @@ target_compile_definitions(vixl PUBLIC
VIXL_CODE_BUFFER_MALLOC VIXL_CODE_BUFFER_MALLOC
) )
if(${CPU_ARCH} STREQUAL "arm") if(${CPU_ARCH} STREQUAL "aarch32")
target_sources(vixl PRIVATE target_sources(vixl PRIVATE
include/vixl/aarch32/assembler-aarch32.h include/vixl/aarch32/assembler-aarch32.h
include/vixl/aarch32/constants-aarch32.h include/vixl/aarch32/constants-aarch32.h
@ -48,7 +48,7 @@ if(${CPU_ARCH} STREQUAL "arm")
${CMAKE_CURRENT_SOURCE_DIR}/include/vixl/aarch32 ${CMAKE_CURRENT_SOURCE_DIR}/include/vixl/aarch32
) )
target_compile_definitions(vixl PUBLIC target_compile_definitions(vixl PUBLIC
VIXL_INCLUDE_TARGET_AARCH32 VIXL_INCLUDE_TARGET_A32
) )
endif() endif()
@ -84,7 +84,7 @@ if(${CPU_ARCH} STREQUAL "aarch64")
${CMAKE_CURRENT_SOURCE_DIR}/include/vixl/aarch64 ${CMAKE_CURRENT_SOURCE_DIR}/include/vixl/aarch64
) )
target_compile_definitions(vixl PUBLIC target_compile_definitions(vixl PUBLIC
VIXL_INCLUDE_TARGET_AARCH64 VIXL_INCLUDE_TARGET_A64
) )
endif() endif()

6
dep/vixl/include/vixl/aarch32/assembler-aarch32.h
View File

@ -27,10 +27,10 @@
#ifndef VIXL_AARCH32_ASSEMBLER_AARCH32_H_ #ifndef VIXL_AARCH32_ASSEMBLER_AARCH32_H_
#define VIXL_AARCH32_ASSEMBLER_AARCH32_H_ #define VIXL_AARCH32_ASSEMBLER_AARCH32_H_
#include "assembler-base-vixl.h" #include "../assembler-base-vixl.h"
#include "aarch32/instructions-aarch32.h" #include "instructions-aarch32.h"
#include "aarch32/location-aarch32.h" #include "location-aarch32.h"
namespace vixl { namespace vixl {
namespace aarch32 { namespace aarch32 {

2
dep/vixl/include/vixl/aarch32/constants-aarch32.h
View File

@ -32,7 +32,7 @@ extern "C" {
#include <stdint.h> #include <stdint.h>
} }
#include "globals-vixl.h" #include "../globals-vixl.h"
namespace vixl { namespace vixl {

4
dep/vixl/include/vixl/aarch32/disasm-aarch32.h
View File

@ -33,8 +33,8 @@ extern "C" {
#include <iomanip> #include <iomanip>
#include "aarch32/constants-aarch32.h" #include "constants-aarch32.h"
#include "aarch32/operands-aarch32.h" #include "operands-aarch32.h"
namespace vixl { namespace vixl {
namespace aarch32 { namespace aarch32 {

7
dep/vixl/include/vixl/aarch32/instructions-aarch32.h
View File

@ -34,9 +34,10 @@ extern "C" {
#include <algorithm> #include <algorithm>
#include <ostream> #include <ostream>
#include "code-buffer-vixl.h" #include "../code-buffer-vixl.h"
#include "utils-vixl.h" #include "../utils-vixl.h"
#include "aarch32/constants-aarch32.h"
#include "constants-aarch32.h"
#ifdef __arm__ #ifdef __arm__
#define HARDFLOAT __attribute__((noinline, pcs("aapcs-vfp"))) #define HARDFLOAT __attribute__((noinline, pcs("aapcs-vfp")))

6
dep/vixl/include/vixl/aarch32/location-aarch32.h
View File

@ -36,9 +36,9 @@ extern "C" {
#include <iomanip> #include <iomanip>
#include <list> #include <list>
#include "invalset-vixl.h" #include "../invalset-vixl.h"
#include "pool-manager.h" #include "../pool-manager.h"
#include "utils-vixl.h" #include "../utils-vixl.h"
#include "constants-aarch32.h" #include "constants-aarch32.h"
#include "instructions-aarch32.h" #include "instructions-aarch32.h"

16
dep/vixl/include/vixl/aarch32/macro-assembler-aarch32.h
View File

@ -28,15 +28,15 @@
#ifndef VIXL_AARCH32_MACRO_ASSEMBLER_AARCH32_H_ #ifndef VIXL_AARCH32_MACRO_ASSEMBLER_AARCH32_H_
#define VIXL_AARCH32_MACRO_ASSEMBLER_AARCH32_H_ #define VIXL_AARCH32_MACRO_ASSEMBLER_AARCH32_H_
#include "code-generation-scopes-vixl.h" #include "../code-generation-scopes-vixl.h"
#include "macro-assembler-interface.h" #include "../macro-assembler-interface.h"
#include "pool-manager-impl.h" #include "../pool-manager-impl.h"
#include "pool-manager.h" #include "../pool-manager.h"
#include "utils-vixl.h" #include "../utils-vixl.h"
#include "aarch32/assembler-aarch32.h" #include "assembler-aarch32.h"
#include "aarch32/instructions-aarch32.h" #include "instructions-aarch32.h"
#include "aarch32/operands-aarch32.h" #include "operands-aarch32.h"
namespace vixl { namespace vixl {

2
dep/vixl/include/vixl/aarch32/operands-aarch32.h
View File

@ -28,7 +28,7 @@
#ifndef VIXL_AARCH32_OPERANDS_AARCH32_H_ #ifndef VIXL_AARCH32_OPERANDS_AARCH32_H_
#define VIXL_AARCH32_OPERANDS_AARCH32_H_ #define VIXL_AARCH32_OPERANDS_AARCH32_H_
#include "aarch32/instructions-aarch32.h" #include "instructions-aarch32.h"
namespace vixl { namespace vixl {
namespace aarch32 { namespace aarch32 {