[GCC_SSP] Turn the GCC stack protector lib into a normal library

Stop pointless target_sources(xxx PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>). The only effect it has is to force the object file into the target, which was already done by specifying the libraries as OBJECT libraries, which is also pointless, and only leads to problems.
This commit is contained in:
Timo Kreuzer
2026-01-29 17:13:40 +02:00
parent f8278bd1ed
commit 07de64139a
12 changed files with 25 additions and 25 deletions
+2 -2
View File
@@ -105,7 +105,7 @@ target_link_libraries(bootmgfw bootlib cportlib blcmlib blrtl libcntpr)
# dynamic analysis switches
if(STACK_PROTECTOR)
target_sources(bootmgfw PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
target_link_libraries(bootmgfw gcc_ssp_nt)
endif()
if(RUNTIME_CHECKS)
@@ -153,7 +153,7 @@ target_link_libraries(rosload bootlib cportlib blcmlib blrtl libcntpr)
# dynamic analysis switches
if(STACK_PROTECTOR)
target_sources(rosload PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
target_link_libraries(rosload gcc_ssp_nt)
endif()
if(RUNTIME_CHECKS)
+1 -1
View File
@@ -228,7 +228,7 @@ target_link_libraries(freeldr_pe freeldr_common cportlib libcntpr blrtl)
# dynamic analysis switches
if(STACK_PROTECTOR)
target_sources(freeldr_pe PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
target_link_libraries(freeldr_pe gcc_ssp_nt)
endif()
if(RUNTIME_CHECKS)
+1 -1
View File
@@ -87,7 +87,7 @@ add_importlibs(rosload freeldr)
# dynamic analysis switches
if(STACK_PROTECTOR)
target_sources(rosload PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
target_link_libraries(rosload gcc_ssp_nt)
endif()
if(RUNTIME_CHECKS)
+1 -1
View File
@@ -140,7 +140,7 @@ target_link_libraries(uefildr uefifreeldr_common cportlib blcmlib blrtl libcntpr
# dynamic analysis switches
if(STACK_PROTECTOR)
target_sources(uefildr PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
target_link_libraries(uefildr gcc_ssp_nt)
endif()
if(RUNTIME_CHECKS)
+3 -3
View File
@@ -3,9 +3,9 @@ add_subdirectory(nt_0600)
spec2def(ntdll.dll def/ntdll.spec ADD_IMPORTLIB)
# Embed RTC libs
# Link GCC stack protector lib
if (STACK_PROTECTOR)
target_sources(libntdll PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
target_link_libraries(libntdll INTERFACE gcc_ssp_nt)
endif()
add_definitions(
@@ -71,7 +71,7 @@ if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600)
endif()
if (STACK_PROTECTOR)
target_sources(ntdll PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
target_link_libraries(ntdll gcc_ssp_nt)
endif()
add_pch(ntdll include/ntdll.h "${PCH_SKIP_SOURCE}")
+2 -2
View File
@@ -207,8 +207,8 @@ target_compile_definitions(libmsvcrt INTERFACE _DLL __USE_CRTIMP)
# Embed msvcrtex into libmsvcrt
target_sources(libmsvcrt PRIVATE $<TARGET_OBJECTS:msvcrtex>)
# Embed RTC libs
# Link GCC stack protector lib
if (STACK_PROTECTOR)
target_sources(libmsvcrt PRIVATE $<TARGET_OBJECTS:gcc_ssp_msvcrt>)
target_link_libraries(libmsvcrt INTERFACE gcc_ssp_msvcrt)
target_link_libraries(libmsvcrt INTERFACE libkernel32) # For OutputDebugStringA
endif()
+2 -2
View File
@@ -4,9 +4,9 @@ spec2def(scsiport.sys scsiport.spec ADD_IMPORTLIB)
include_directories(
${REACTOS_SOURCE_DIR}/sdk/lib/drivers/sptilib)
# Embed RTC libs
# Link GCC stack protector lib
if (STACK_PROTECTOR)
target_sources(libscsiport PRIVATE $<TARGET_OBJECTS:gcc_ssp_scsiport>)
target_link_libraries(libscsiport INTERFACE gcc_ssp_scsiport)
endif()
list(APPEND SOURCE
+3 -3
View File
@@ -16,9 +16,9 @@ set(NTKRNLMP_ASM_SOURCE ${ASM_SOURCE})
spec2def(ntoskrnl.exe ntoskrnl.spec ADD_IMPORTLIB)
# Embed RTC libs
# Link GCC stack protector lib
if (STACK_PROTECTOR)
target_sources(libntoskrnl PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
target_link_libraries(libntoskrnl INTERFACE gcc_ssp_nt)
endif()
add_asm_files(ntoskrnl_asm ${NTOSKRNL_ASM_SOURCE})
@@ -49,7 +49,7 @@ source_group(TREE ${REACTOS_SOURCE_DIR}/ntoskrnl PREFIX "Source Files" FILES ${N
target_link_libraries(ntoskrnl ntoskrnl_vista cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr setjmp wdmguid poguid ioevent)
if(STACK_PROTECTOR)
target_sources(ntoskrnl PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
target_link_libraries(ntoskrnl gcc_ssp_nt)
endif()
add_importlibs(ntoskrnl hal kdcom bootvid)
+1 -1
View File
@@ -34,7 +34,7 @@ target_compile_definitions(ntkrnlmp PRIVATE CONFIG_SMP)
# dynamic analysis switches
if(STACK_PROTECTOR)
target_sources(ntkrnlmp PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
target_link_libraries(ntkrnlmp gcc_ssp_nt)
endif()
target_link_libraries(ntkrnlmp ntoskrnl_vista cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr setjmp wdmguid poguid ioevent)
+5 -5
View File
@@ -1,19 +1,19 @@
add_library(gcc_ssp_nt OBJECT gcc_ssp.c)
add_library(gcc_ssp_nt STATIC gcc_ssp.c)
add_dependencies(gcc_ssp_nt xdk)
add_library(gcc_ssp_msvcrt OBJECT gcc_ssp.c)
add_library(gcc_ssp_msvcrt STATIC gcc_ssp.c)
target_compile_definitions(gcc_ssp_msvcrt PRIVATE _GCC_SSP_MSVCRT_)
add_dependencies(gcc_ssp_msvcrt xdk)
add_library(gcc_ssp_win32k OBJECT gcc_ssp.c)
add_library(gcc_ssp_win32k STATIC gcc_ssp.c)
target_compile_definitions(gcc_ssp_win32k PRIVATE _GCC_SSP_WIN32K_)
add_dependencies(gcc_ssp_win32k xdk)
add_library(gcc_ssp_videoprt OBJECT gcc_ssp.c)
add_library(gcc_ssp_videoprt STATIC gcc_ssp.c)
target_compile_definitions(gcc_ssp_videoprt PRIVATE _GCC_SSP_VIDEOPRT_)
add_dependencies(gcc_ssp_videoprt xdk)
add_library(gcc_ssp_scsiport OBJECT gcc_ssp.c)
add_library(gcc_ssp_scsiport STATIC gcc_ssp.c)
target_compile_definitions(gcc_ssp_scsiport PRIVATE _GCC_SSP_SCSIPORT_)
add_dependencies(gcc_ssp_scsiport xdk)
+2 -2
View File
@@ -22,9 +22,9 @@ add_subdirectory(win32u)
spec2def(win32k.sys win32k.spec ADD_IMPORTLIB)
# embed RTC libs
# Link GCC stack protector lib
if (STACK_PROTECTOR)
target_sources(libwin32k PRIVATE $<TARGET_OBJECTS:gcc_ssp_win32k>)
target_link_libraries(libwin32k INTERFACE gcc_ssp_win32k)
endif()
include_directories(
+2 -2
View File
@@ -3,9 +3,9 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
add_definitions(-D_VIDEOPORT_)
spec2def(videoprt.sys videoprt.spec ADD_IMPORTLIB)
# Embed RTC libs
# Link GCC stack protector lib
if (STACK_PROTECTOR)
target_sources(libvideoprt PRIVATE $<TARGET_OBJECTS:gcc_ssp_videoprt>)
target_link_libraries(libvideoprt INTERFACE gcc_ssp_videoprt)
endif()
list(APPEND SOURCE