Ros-diffs March 2021

ros-diffs@reactos.org

15 participants
161 discussions

[reactos] 10/14: [BOOTMGFW] Explicitly disable NX compatibility

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d811c2d1cfa8995b7a66… commit 0d811c2d1cfa8995b7a66225061ec8238392df4f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Feb 3 17:16:05 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [BOOTMGFW] Explicitly disable NX compatibility CORE-17423 --- boot/environ/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/environ/CMakeLists.txt b/boot/environ/CMakeLists.txt index 9c4d5dcd96f..bc4e21ee4a0 100644 --- a/boot/environ/CMakeLists.txt +++ b/boot/environ/CMakeLists.txt @@ -85,7 +85,7 @@ if(MSVC) if(ARCH STREQUAL "arm") add_target_link_flags(bootmgfw "/ignore:4078 /ignore:4254 /DRIVER") else() - add_target_link_flags(bootmgfw "/ignore:4078 /ignore:4254 /DRIVER /DYNAMICBASE:NO /FIXED") + add_target_link_flags(bootmgfw "/ignore:4078 /ignore:4254 /DRIVER /DYNAMICBASE:NO /NXCOMPAT:NO /FIXED") endif() else() add_target_link_flags(bootmgfw "-Wl,--strip-all,--exclude-all-symbols")

3 years, 9 months

[reactos] 09/14: [CMAKE] Explicitly declare libcntpr as a static lib

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2306c83e5c4d5f23f8618… commit 2306c83e5c4d5f23f8618abd6cf2ccec7fe5b963 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 2 19:21:06 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [CMAKE] Explicitly declare libcntpr as a static lib --- sdk/lib/crt/libcntpr.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/crt/libcntpr.cmake b/sdk/lib/crt/libcntpr.cmake index f15f60367b1..e91db0896cc 100644 --- a/sdk/lib/crt/libcntpr.cmake +++ b/sdk/lib/crt/libcntpr.cmake @@ -240,7 +240,7 @@ endif() set_source_files_properties(${LIBCNTPR_ASM_SOURCE} PROPERTIES COMPILE_DEFINITIONS "NO_RTL_INLINES;_NTSYSTEM_;_NTDLLBUILD_;_LIBCNT_;__CRT__NO_INLINE;CRTDLL") add_asm_files(libcntpr_asm ${LIBCNTPR_ASM_SOURCE}) -add_library(libcntpr ${LIBCNTPR_SOURCE} ${libcntpr_asm}) +add_library(libcntpr STATIC ${LIBCNTPR_SOURCE} ${libcntpr_asm}) target_compile_definitions(libcntpr PRIVATE NO_RTL_INLINES _NTSYSTEM_

3 years, 9 months

[reactos] 08/14: [CRT] Declare strlen & wcslen as _CRTIMP

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97d4cb6ee085b59a76c0e… commit 97d4cb6ee085b59a76c0e2174a66c2b074076086 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 2 17:59:42 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [CRT] Declare strlen & wcslen as _CRTIMP --- sdk/include/crt/string.h | 1 + sdk/include/crt/wchar.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sdk/include/crt/string.h b/sdk/include/crt/string.h index 3249254c947..caeb23fcdc9 100644 --- a/sdk/include/crt/string.h +++ b/sdk/include/crt/string.h @@ -150,6 +150,7 @@ extern "C" { _In_z_ const char *_Str1, _In_z_ const char *_Str2); + _CRTIMP size_t __cdecl strlen( diff --git a/sdk/include/crt/wchar.h b/sdk/include/crt/wchar.h index eadde09cfbd..309bed76cef 100644 --- a/sdk/include/crt/wchar.h +++ b/sdk/include/crt/wchar.h @@ -1929,6 +1929,7 @@ _CRTIMP int __cdecl iswblank(wint_t _C); _In_z_ const wchar_t *_Str, _In_z_ const wchar_t *_Control); + _CRTIMP size_t __cdecl wcslen(

3 years, 9 months

[reactos] 07/14: [CMAKE] Get rid of add_object_library

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49286a6225b8dda6600cf… commit 49286a6225b8dda6600cf0728b64691e1c97f68b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 2 16:33:15 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [CMAKE] Get rid of add_object_library It's not needed anymore --- hal/halx86/CMakeLists.txt | 30 ++++++------------------------ hal/halx86/acpi.cmake | 5 +---- hal/halx86/apic.cmake | 2 +- hal/halx86/generic.cmake | 2 +- hal/halx86/legacy.cmake | 6 +----- hal/halx86/pc98.cmake | 6 ++---- hal/halx86/pic.cmake | 2 +- hal/halx86/up.cmake | 2 +- hal/halx86/xbox.cmake | 7 ++----- sdk/cmake/CMakeMacros.cmake | 10 ---------- 10 files changed, 16 insertions(+), 56 deletions(-) diff --git a/hal/halx86/CMakeLists.txt b/hal/halx86/CMakeLists.txt index e56a791d8da..68d13839dae 100644 --- a/hal/halx86/CMakeLists.txt +++ b/hal/halx86/CMakeLists.txt @@ -15,30 +15,12 @@ function(add_hal _halname) spec2def(${_halname}.dll ../hal.spec ADD_IMPORTLIB) # Create the actual target - if(NOT MSVC) - foreach(_component ${_haldata_COMPONENTS}) - list(APPEND _haldata_SOURCES "$<TARGET_OBJECTS:lib_hal_${_component}>") - endforeach() - add_library(${_halname} MODULE - ${_haldata_SOURCES} - ${CMAKE_CURRENT_BINARY_DIR}/hal.def) - else() - foreach(_component ${_haldata_COMPONENTS}) - list(APPEND _haldata_LIBS "lib_hal_${_component}") - endforeach() - add_library(${_halname} MODULE - ${_haldata_SOURCES} - ${CMAKE_CURRENT_BINARY_DIR}/hal.def) - target_link_libraries(${_halname} ${_haldata_LIBS}) - endif() - - if(${_halname} STREQUAL "halpc98") - target_compile_definitions(lib_hal_pc98 PRIVATE SARCH_PC98) - endif() - - if(${_halname} STREQUAL "halxbox") - target_compile_definitions(lib_hal_xbox PRIVATE SARCH_XBOX) - endif() + foreach(_component ${_haldata_COMPONENTS}) + list(APPEND _haldata_SOURCES "$<TARGET_OBJECTS:lib_hal_${_component}>") + endforeach() + add_library(${_halname} MODULE + ${_haldata_SOURCES} + ${CMAKE_CURRENT_BINARY_DIR}/hal.def) if(${_halname} STREQUAL "hal") target_link_libraries(${_halname} libcntpr arbiter) diff --git a/hal/halx86/acpi.cmake b/hal/halx86/acpi.cmake index af08c9fc18f..acc856a0b72 100644 --- a/hal/halx86/acpi.cmake +++ b/hal/halx86/acpi.cmake @@ -5,10 +5,7 @@ list(APPEND HAL_ACPI_SOURCE acpi/busemul.c legacy/bus/pcibus.c) -add_object_library(lib_hal_acpi ${HAL_ACPI_SOURCE}) +add_library(lib_hal_acpi OBJECT ${HAL_ACPI_SOURCE}) add_dependencies(lib_hal_acpi bugcodes xdk) #add_pch(lib_hal_acpi include/hal.h) -if(MSVC) - target_link_libraries(lib_hal_acpi lib_hal_generic) -endif() diff --git a/hal/halx86/apic.cmake b/hal/halx86/apic.cmake index 6349e726af0..9c0139e3504 100644 --- a/hal/halx86/apic.cmake +++ b/hal/halx86/apic.cmake @@ -11,5 +11,5 @@ list(APPEND HAL_APIC_SOURCE apic/tsc.c) add_asm_files(lib_hal_apic_asm ${HAL_APIC_ASM_SOURCE}) -add_object_library(lib_hal_apic ${HAL_APIC_SOURCE} ${lib_hal_apic_asm}) +add_library(lib_hal_apic OBJECT ${HAL_APIC_SOURCE} ${lib_hal_apic_asm}) add_dependencies(lib_hal_apic asm) diff --git a/hal/halx86/generic.cmake b/hal/halx86/generic.cmake index 19eb850164b..4948e111fb6 100644 --- a/hal/halx86/generic.cmake +++ b/hal/halx86/generic.cmake @@ -24,5 +24,5 @@ if(ARCH STREQUAL "i386") endif() add_asm_files(lib_hal_generic_asm ${HAL_GENERIC_ASM_SOURCE}) -add_object_library(lib_hal_generic ${HAL_GENERIC_SOURCE} ${lib_hal_generic_asm}) +add_library(lib_hal_generic OBJECT ${HAL_GENERIC_SOURCE} ${lib_hal_generic_asm}) add_dependencies(lib_hal_generic asm) diff --git a/hal/halx86/legacy.cmake b/hal/halx86/legacy.cmake index d60be7f5938..2f487748524 100644 --- a/hal/halx86/legacy.cmake +++ b/hal/halx86/legacy.cmake @@ -11,10 +11,6 @@ list(APPEND HAL_LEGACY_SOURCE legacy/halpnpdd.c legacy/halpcat.c) -add_object_library(lib_hal_legacy ${HAL_LEGACY_SOURCE}) +add_library(lib_hal_legacy OBJECT ${HAL_LEGACY_SOURCE}) add_dependencies(lib_hal_legacy bugcodes xdk) #add_pch(lib_hal_legacy include/hal.h) - -if(MSVC) - target_link_libraries(lib_hal_legacy lib_hal_generic) -endif() diff --git a/hal/halx86/pc98.cmake b/hal/halx86/pc98.cmake index fd51a9851b9..9f04972a212 100644 --- a/hal/halx86/pc98.cmake +++ b/hal/halx86/pc98.cmake @@ -48,10 +48,8 @@ list(APPEND HAL_PC98_SOURCE legacy/halpcat.c) add_asm_files(lib_hal_pc98_asm ${HAL_PC98_ASM_SOURCE}) -add_object_library(lib_hal_pc98 ${HAL_PC98_SOURCE} ${lib_hal_pc98_asm}) +add_library(lib_hal_pc98 OBJECT ${HAL_PC98_SOURCE} ${lib_hal_pc98_asm}) add_dependencies(lib_hal_pc98 bugcodes xdk asm) #add_pch(lib_hal_pc98 pc98/halpc98.h) -if(MSVC) - target_link_libraries(lib_hal_pc98) -endif() +target_compile_definitions(lib_hal_pc98 PRIVATE SARCH_PC98) diff --git a/hal/halx86/pic.cmake b/hal/halx86/pic.cmake index bd5f15f7894..d8f151f6071 100644 --- a/hal/halx86/pic.cmake +++ b/hal/halx86/pic.cmake @@ -13,5 +13,5 @@ list(APPEND HAL_PIC_SOURCE up/pic.c) add_asm_files(lib_hal_pic_asm ${HAL_PIC_ASM_SOURCE}) -add_object_library(lib_hal_pic ${HAL_PIC_SOURCE} ${lib_hal_pic_asm}) +add_library(lib_hal_pic OBJECT ${HAL_PIC_SOURCE} ${lib_hal_pic_asm}) add_dependencies(lib_hal_pic asm) diff --git a/hal/halx86/up.cmake b/hal/halx86/up.cmake index d61cc0c2c83..2d40c7da185 100644 --- a/hal/halx86/up.cmake +++ b/hal/halx86/up.cmake @@ -3,5 +3,5 @@ list(APPEND HAL_UP_SOURCE generic/spinlock.c up/processor.c) -add_object_library(lib_hal_up ${HAL_UP_SOURCE}) +add_library(lib_hal_up OBJECT ${HAL_UP_SOURCE}) add_dependencies(lib_hal_up bugcodes xdk) diff --git a/hal/halx86/xbox.cmake b/hal/halx86/xbox.cmake index 6b121689c95..ffdbbfe8026 100644 --- a/hal/halx86/xbox.cmake +++ b/hal/halx86/xbox.cmake @@ -40,10 +40,7 @@ list(APPEND HAL_XBOX_SOURCE up/pic.c) add_asm_files(lib_hal_xbox_asm ${HAL_XBOX_ASM_SOURCE}) -add_object_library(lib_hal_xbox ${HAL_XBOX_SOURCE} ${lib_hal_xbox_asm}) +add_library(lib_hal_xbox OBJECT ${HAL_XBOX_SOURCE} ${lib_hal_xbox_asm}) add_dependencies(lib_hal_xbox bugcodes xdk asm) #add_pch(lib_hal_xbox xbox/halxbox.h) - -if(MSVC) - target_link_libraries(lib_hal_xbox) -endif() +target_compile_definitions(lib_hal_xbox PRIVATE SARCH_XBOX) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 80488a3a63b..1429580b2ac 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -717,16 +717,6 @@ function(get_defines OUTPUT_VAR) set(${OUTPUT_VAR} ${__tmp_var} PARENT_SCOPE) endfunction() -if(NOT MSVC) - function(add_object_library _target) - add_library(${_target} OBJECT ${ARGN}) - endfunction() -else() - function(add_object_library _target) - add_library(${_target} ${ARGN}) - endfunction() -endif() - function(add_registry_inf) # Add to the inf files list foreach(_file ${ARGN})

3 years, 9 months

[reactos] 06/14: [SHLWAPI] Use an object library to separate C & C++ compilation units

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93d741c3f41f190e9f3da… commit 93d741c3f41f190e9f3dabb8c5c753e71731bc7f Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 2 16:18:04 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [SHLWAPI] Use an object library to separate C & C++ compilation units CORE-17423 --- dll/win32/shlwapi/CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dll/win32/shlwapi/CMakeLists.txt b/dll/win32/shlwapi/CMakeLists.txt index 076aaa4dcd6..af8ec781824 100644 --- a/dll/win32/shlwapi/CMakeLists.txt +++ b/dll/win32/shlwapi/CMakeLists.txt @@ -27,21 +27,28 @@ list(APPEND SOURCE url.c) list(APPEND PCH_SKIP_SOURCE - autocomp.cpp wsprintf.c ${CMAKE_CURRENT_BINARY_DIR}/shlwapi_stubs.c) add_library(shlwapi MODULE ${SOURCE} ${PCH_SKIP_SOURCE} + $<TARGET_OBJECTS:shlwapi_autocomp> shlwapi.rc ${CMAKE_CURRENT_BINARY_DIR}/shlwapi.def) # our C++ atlbase.h conflicts with the one from wine, so only use wine includes for C -target_include_directories(shlwapi BEFORE PRIVATE $<$<COMPILE_LANGUAGE:C>:${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine>) +# Unfortunately, we can't use different includes for C & C++ in VS generator, so use an object library to achieve this +target_include_directories(shlwapi BEFORE PRIVATE ${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine) + +add_library(shlwapi_autocomp OBJECT autocomp.cpp) +target_link_libraries(shlwapi_autocomp PRIVATE atl_classes) +target_compile_definitions(shlwapi_autocomp PRIVATE $<TARGET_PROPERTY:shlwapi,COMPILE_DEFINITIONS>) +target_compile_options(shlwapi_autocomp PRIVATE $<TARGET_PROPERTY:shlwapi,COMPILE_OPTIONS>) +add_dependencies(shlwapi_autocomp psdk) set_module_type(shlwapi win32dll UNICODE) -target_link_libraries(shlwapi uuid wine cpprt atl_classes) +target_link_libraries(shlwapi uuid wine cpprt) add_delay_importlibs(shlwapi userenv oleaut32 ole32 comdlg32 mpr mlang urlmon shell32 winmm version) add_importlibs(shlwapi user32 gdi32 advapi32 wininet msvcrt kernel32 ntdll) add_pch(shlwapi precomp.h "${PCH_SKIP_SOURCE}")

3 years, 9 months

[reactos] 05/14: [BOOTMGFW] Explicitly disable dynamic base

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3476cdae7722cb0defee1… commit 3476cdae7722cb0defee1de63a61d56fc7390c77 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Feb 2 16:04:13 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [BOOTMGFW] Explicitly disable dynamic base CORE-17423 --- boot/environ/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/environ/CMakeLists.txt b/boot/environ/CMakeLists.txt index 05aa5b81ef9..9c4d5dcd96f 100644 --- a/boot/environ/CMakeLists.txt +++ b/boot/environ/CMakeLists.txt @@ -85,7 +85,7 @@ if(MSVC) if(ARCH STREQUAL "arm") add_target_link_flags(bootmgfw "/ignore:4078 /ignore:4254 /DRIVER") else() - add_target_link_flags(bootmgfw "/ignore:4078 /ignore:4254 /DRIVER /FIXED") + add_target_link_flags(bootmgfw "/ignore:4078 /ignore:4254 /DRIVER /DYNAMICBASE:NO /FIXED") endif() else() add_target_link_flags(bootmgfw "-Wl,--strip-all,--exclude-all-symbols")

3 years, 9 months

[reactos] 04/14: [GITHUB] Add MSBUILD CI action

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3885ad87ca80a322e4663… commit 3885ad87ca80a322e4663f8d1d06d1506be8ed09 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Jan 27 09:46:27 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [GITHUB] Add MSBUILD CI action --- .github/workflows/build.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30d0b98fced..434286208c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -228,3 +228,29 @@ jobs: with: name: reactos-msvc-amd64-${{github.sha}} path: build/livecd.iso + + build-msbuild-i386: + name: MSBuild (i386) + runs-on: windows-latest + steps: + - name: Install Flex and Bison + run: | + curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z + 7z x flexbison.7z -O${{github.workspace}}\bin + echo "${{github.workspace}}\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + echo "M4=${{github.workspace}}\bin\m4.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - name: Add CL to PATH + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64_x86 + - uses: actions/checkout@v2 + with: + path: src + - name: Configure + run: | + mkdir build + cd build + cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=i386 -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 ${{github.workspace}}\src + - name: Build + run: cmake --build ${{github.workspace}}\build --target bootcd --target livecd

3 years, 9 months

[reactos] 03/14: [CMAKE] Disable policy CMP0091 and set /MT flag explicitly for Visual Studio generator

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49000c6471cd79745a36a… commit 49000c6471cd79745a36a8cadf33eeebc50ed9a4 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jan 22 12:11:34 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [CMAKE] Disable policy CMP0091 and set /MT flag explicitly for Visual Studio generator --- CMakeLists.txt | 13 +++++++++++++ toolchain-msvc.cmake | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d090b2f79c0..fcd92b5512a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,13 @@ endif() include(CMakeDependentOption) +# CMAKE_CROSSCOMPILING and MSVC_IDE are not set until project() is called, so let's test this instead +if ((DEFINED CMAKE_TOOLCHAIN_FILE) AND (CMAKE_GENERATOR MATCHES "Visual Studio.*")) +# Do not use MSVC_RUNTIME_LIBRARY target property. We use our own flags instead +message(WARNING "Setting policy CMP0091 to OLD behaviour") +cmake_policy(SET CMP0091 OLD) +endif() + project(REACTOS) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -120,6 +127,12 @@ else() # Print build type message("-- Build Type: ${CMAKE_BUILD_TYPE}") + # Always add /MT in VS CMAKE_GENERATOR + if (MSVC_IDE) + add_compile_options("/MT") + endif() + + # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search # programs in the host environment diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index dbb901ae874..2aae2edbdd4 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -64,7 +64,6 @@ else() set(CMAKE_ASM_MASM_FLAGS_INIT "/Cp") endif() - set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "") set(CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_CURRENT_LIST_DIR}/overrides-msvc.cmake")

3 years, 9 months

[reactos] 02/14: [CMAKE] Preprocess the ASM files but let msbuild handle their actual compilation

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c68739e56610c5e7877e3… commit c68739e56610c5e7877e313662b178bec79437a8 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Jan 22 11:28:11 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [CMAKE] Preprocess the ASM files but let msbuild handle their actual compilation CORE-17423 --- CMakeLists.txt | 1 - sdk/cmake/msvc.cmake | 62 +++++++++++++++++++++------------------------------- toolchain-msvc.cmake | 2 ++ 3 files changed, 27 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 99488e38702..d090b2f79c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,7 +214,6 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to # Activate support for assembly source files if (MSVC) - set(CMAKE_ASM_MASM_SOURCE_FILE_EXTENSIONS s;S) enable_language(ASM_MASM) else() enable_language(ASM) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index abd935821a4..33fdbea00f0 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -189,14 +189,13 @@ else() set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <INCLUDES> <FLAGS> <DEFINES> ${I18N_DEFS} /fo <OBJECT> <SOURCE>") endif() -if(ARCH STREQUAL "arm") - set(CMAKE_ASM_MASM_COMPILE_OBJECT - "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <INCLUDES> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" - "<CMAKE_ASM_MASM_COMPILER> -nologo -o <OBJECT> <OBJECT>.tmp") -else() - set(CMAKE_ASM_MASM_COMPILE_OBJECT - "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <INCLUDES> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" - "<CMAKE_ASM_MASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") +# We don't put <INCLUDES> <DEFINES> <FLAGS> because this is handled in add_asm_files macro +if (NOT MSVC_IDE) + if(ARCH STREQUAL "arm") + set(CMAKE_ASM_MASM_COMPILE_OBJECT "<CMAKE_ASM_MASM_COMPILER> -nologo -o <OBJECT> <SOURCE>") + else() + set(CMAKE_ASM_MASM_COMPILE_OBJECT "<CMAKE_ASM_MASM_COMPILER> /nologo /Cp /Fo <OBJECT> /c /Ta <SOURCE>") + endif() endif() if(_VS_ANALYZE_) @@ -437,37 +436,26 @@ function(allow_warnings __module) endfunction() macro(add_asm_files _target) - if(MSVC_IDE) - get_defines(_directory_defines) - get_includes(_directory_includes) - get_directory_property(_defines COMPILE_DEFINITIONS) - foreach(_source_file ${ARGN}) - get_filename_component(_source_file_base_name ${_source_file} NAME_WE) - get_filename_component(_source_file_full_path ${_source_file} ABSOLUTE) - set(_preprocessed_asm_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.tmp) - set(_object_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.obj) - get_source_file_property(_defines_semicolon_list ${_source_file_full_path} COMPILE_DEFINITIONS) - unset(_source_file_defines) - foreach(_define ${_defines_semicolon_list}) - if(NOT ${_define} STREQUAL "NOTFOUND") - list(APPEND _source_file_defines -D${_define}) - endif() - endforeach() - if(ARCH STREQUAL "arm") - set(_pp_asm_compile_command ${CMAKE_ASM_MASM_COMPILER} -nologo -o ${_object_file} ${_preprocessed_asm_file}) - else() - set(_pp_asm_compile_command ${CMAKE_ASM_MASM_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file}) + get_defines(_directory_defines) + get_includes(_directory_includes) + get_directory_property(_defines COMPILE_DEFINITIONS) + foreach(_source_file ${ARGN}) + get_filename_component(_source_file_base_name ${_source_file} NAME_WE) + get_filename_component(_source_file_full_path ${_source_file} ABSOLUTE) + set(_preprocessed_asm_file ${CMAKE_CURRENT_BINARY_DIR}/asm/${_source_file_base_name}_${_target}.asm) + get_source_file_property(_defines_semicolon_list ${_source_file_full_path} COMPILE_DEFINITIONS) + unset(_source_file_defines) + foreach(_define ${_defines_semicolon_list}) + if(NOT ${_define} STREQUAL "NOTFOUND") + list(APPEND _source_file_defines -D${_define}) endif() - add_custom_command( - OUTPUT ${_preprocessed_asm_file} ${_object_file} - COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_source_file_full_path} > ${_preprocessed_asm_file} && ${_pp_asm_compile_command} - DEPENDS ${_source_file_full_path}) - set_source_files_properties(${_object_file} PROPERTIES EXTERNAL_OBJECT TRUE) - list(APPEND ${_target} ${_object_file}) endforeach() - else() - list(APPEND ${_target} ${ARGN}) - endif() + add_custom_command( + OUTPUT ${_preprocessed_asm_file} + COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_source_file_full_path} > ${_preprocessed_asm_file} + DEPENDS ${_source_file_full_path}) + list(APPEND ${_target} ${_preprocessed_asm_file}) + endforeach() endmacro() function(add_linker_script _target _linker_script_file) diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index bde0f0ae6a7..dbb901ae874 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -54,12 +54,14 @@ set(CMAKE_MC_COMPILER mc) set(CMAKE_RC_COMPILER rc) if(ARCH STREQUAL "amd64") set(CMAKE_ASM_MASM_COMPILER ml64) + set(CMAKE_ASM_MASM_FLAGS_INIT "/Cp") elseif(ARCH STREQUAL "arm") set(CMAKE_ASM_MASM_COMPILER armasm) elseif(ARCH STREQUAL "arm64") set(CMAKE_ASM_MASM_COMPILER armasm64) else() set(CMAKE_ASM_MASM_COMPILER ml) + set(CMAKE_ASM_MASM_FLAGS_INIT "/Cp") endif()

3 years, 9 months

[reactos] 01/14: [CMAKE] Use ASM_MASM language when building with MSVC toolchain

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=41130ab5c6a9173a5bac7… commit 41130ab5c6a9173a5bac7ef2d6ea7e33c385cedd Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Jan 21 10:20:21 2021 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Mar 3 08:34:32 2021 +0100 [CMAKE] Use ASM_MASM language when building with MSVC toolchain CORE-17423 --- CMakeLists.txt | 7 ++++++- sdk/cmake/Compiler/VISUAL-ASM.cmake | 2 -- sdk/cmake/msvc.cmake | 39 ++++++++++++++++--------------------- toolchain-msvc.cmake | 8 ++++---- 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5795482d782..99488e38702 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -213,7 +213,12 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to endif() # Activate support for assembly source files - enable_language(ASM) + if (MSVC) + set(CMAKE_ASM_MASM_SOURCE_FILE_EXTENSIONS s;S) + enable_language(ASM_MASM) + else() + enable_language(ASM) + endif() # Activate language support for resource files enable_language(RC) diff --git a/sdk/cmake/Compiler/VISUAL-ASM.cmake b/sdk/cmake/Compiler/VISUAL-ASM.cmake deleted file mode 100644 index 0f8019a8e80..00000000000 --- a/sdk/cmake/Compiler/VISUAL-ASM.cmake +++ /dev/null @@ -1,2 +0,0 @@ - -set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s;S) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 3b70fd92744..abd935821a4 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -187,15 +187,16 @@ if(MSVC_IDE) add_definitions(/DLANGUAGE_EN_US) else() set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> /nologo <INCLUDES> <FLAGS> <DEFINES> ${I18N_DEFS} /fo <OBJECT> <SOURCE>") - if(ARCH STREQUAL "arm") - set(CMAKE_ASM_COMPILE_OBJECT - "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <INCLUDES> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" - "<CMAKE_ASM_COMPILER> -nologo -o <OBJECT> <OBJECT>.tmp") - else() - set(CMAKE_ASM_COMPILE_OBJECT - "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <INCLUDES> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" - "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") - endif() +endif() + +if(ARCH STREQUAL "arm") + set(CMAKE_ASM_MASM_COMPILE_OBJECT + "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <INCLUDES> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_ASM_MASM_COMPILER> -nologo -o <OBJECT> <OBJECT>.tmp") +else() + set(CMAKE_ASM_MASM_COMPILE_OBJECT + "cl ${cl_includes_flag} /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm <INCLUDES> <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" + "<CMAKE_ASM_MASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") endif() if(_VS_ANALYZE_) @@ -214,9 +215,9 @@ elseif(_PREFAST_) endif() set(CMAKE_RC_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) -set(CMAKE_ASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) +set(CMAKE_ASM_MASM_CREATE_SHARED_LIBRARY ${CMAKE_C_CREATE_SHARED_LIBRARY}) set(CMAKE_RC_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_MODULE}) -set(CMAKE_ASM_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_MODULE}) +set(CMAKE_ASM_MASM_CREATE_SHARED_MODULE ${CMAKE_C_CREATE_SHARED_MODULE}) set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) function(set_entrypoint _module _entrypoint) @@ -264,12 +265,6 @@ function(set_module_type_toolchain MODULE TYPE) endfunction() -if(ARCH STREQUAL "arm") - set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -nologo -o <OBJECT> <SOURCE>") -else() - set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <SOURCE>") -endif() - function(add_delay_importlibs _module) get_target_property(_module_type ${_module} TYPE) if(_module_type STREQUAL "STATIC_LIBRARY") @@ -304,9 +299,9 @@ function(generate_import_lib _libname _dllname _spec_file) # Compile the generated asm stub file if(ARCH STREQUAL "arm") - set(_asm_stub_command ${CMAKE_ASM_COMPILER} -nologo -o ${_asm_stubs_file}.obj ${_asm_stubs_file}) + set(_asm_stub_command ${CMAKE_ASM_MASM_COMPILER} -nologo -o ${_asm_stubs_file}.obj ${_asm_stubs_file}) else() - set(_asm_stub_command ${CMAKE_ASM_COMPILER} /nologo /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file}) + set(_asm_stub_command ${CMAKE_ASM_MASM_COMPILER} /nologo /Cp /Fo${_asm_stubs_file}.obj /c /Ta ${_asm_stubs_file}) endif() add_custom_command( OUTPUT ${_asm_stubs_file}.obj @@ -459,9 +454,9 @@ macro(add_asm_files _target) endif() endforeach() if(ARCH STREQUAL "arm") - set(_pp_asm_compile_command ${CMAKE_ASM_COMPILER} -nologo -o ${_object_file} ${_preprocessed_asm_file}) + set(_pp_asm_compile_command ${CMAKE_ASM_MASM_COMPILER} -nologo -o ${_object_file} ${_preprocessed_asm_file}) else() - set(_pp_asm_compile_command ${CMAKE_ASM_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file}) + set(_pp_asm_compile_command ${CMAKE_ASM_MASM_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file}) endif() add_custom_command( OUTPUT ${_preprocessed_asm_file} ${_object_file} @@ -486,7 +481,7 @@ function(add_linker_script _target _linker_script_file) OUTPUT ${_generated_file} COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${_file_full_path}" "${_generated_file}" DEPENDS ${_file_full_path}) - set_source_files_properties(${_generated_file} PROPERTIES LANGUAGE "ASM" GENERATED TRUE) + set_source_files_properties(${_generated_file} PROPERTIES LANGUAGE "ASM_MASM" GENERATED TRUE) add_asm_files(${_target}_linker_file ${_generated_file}) # Generate the C module containing extra sections specifications and layout, diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index e30e075cba0..bde0f0ae6a7 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -53,13 +53,13 @@ endif() set(CMAKE_MC_COMPILER mc) set(CMAKE_RC_COMPILER rc) if(ARCH STREQUAL "amd64") - set(CMAKE_ASM_COMPILER ml64) + set(CMAKE_ASM_MASM_COMPILER ml64) elseif(ARCH STREQUAL "arm") - set(CMAKE_ASM_COMPILER armasm) + set(CMAKE_ASM_MASM_COMPILER armasm) elseif(ARCH STREQUAL "arm64") - set(CMAKE_ASM_COMPILER armasm64) + set(CMAKE_ASM_MASM_COMPILER armasm64) else() - set(CMAKE_ASM_COMPILER ml) + set(CMAKE_ASM_MASM_COMPILER ml) endif()

3 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2021