Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 20:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SDK] Allow ARM64 MSVC to complete configuration (#4045)

Browse source 
- Add some of the missing CMake adjustments to continue the configure and compile process with ARM64 MSVC
- Created quick stubs for the functions in SDK needed to finish the configuration process
- Put in an ARM64 option for spec2def

CORE-17518 CORE-17615
This commit is contained in:
Justin Miller 2021-10-22 08:52:32 -07:00 • committed by GitHub
parent 4b0249e98a
commit be223b9de7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 64 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sdk/cmake/msvc.cmake
View file

@ -256,6 +256,8 @@ function(set_subsystem MODULE SUBSYSTEM)
target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},5.02")
elseif(ARCH STREQUAL "arm")
target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},6.02")
elseif(ARCH STREQUAL "arm64")
target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},6.04")
else()
target_link_options(${MODULE} PRIVATE "/SUBSYSTEM:${_subsystem},5.01")
endif()
@ -363,6 +365,9 @@ if(ARCH STREQUAL "amd64")
elseif(ARCH STREQUAL "arm")
add_definitions(/D__arm__)
set(SPEC2DEF_ARCH arm)
elseif(ARCH STREQUAL "arm64")
add_definitions(/D__arm64__)
set(SPEC2DEF_ARCH arm64)
else()
set(SPEC2DEF_ARCH i386)
endif()
@ -440,7 +445,7 @@ function(CreateBootSectorTarget _target_name _asm_file _binary_file _base_addres
COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag} /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_includes} ${_defines} /D__ASM__ /D_USE_ML /EP /c ${_asm_file} > ${_temp_file}
DEPENDS ${_asm_file})
if(ARCH STREQUAL "arm")
if(ARCH STREQUAL "arm" OR ARCH STREQUAL "arm64")
set(_asm16_command ${CMAKE_ASM16_COMPILER} -nologo -o ${_object_file} ${_temp_file})
else()
set(_asm16_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_temp_file})