File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -68,9 +68,6 @@ if (MSVC)
6868 add_compile_options ($<$<COMPILE_LANGUAGE :CXX >:$<TARGET_PROPERTY :CLR_EH_OPTION >>)
6969 add_link_options ($<$<BOOL :$<TARGET_PROPERTY :CLR_CONTROL_FLOW_GUARD >>:/guard :cf >)
7070
71- # Load all imported DLLs from the System32 directory.
72- add_linker_flag (/DEPENDENTLOADFLAG:0x800 )
73-
7471 # Linker flags
7572 #
7673 set (WINDOWS_SUBSYSTEM_VERSION 6.01)
Original file line number Diff line number Diff line change @@ -64,10 +64,6 @@ if (CLR_CMAKE_HOST_WIN32)
6464 remove_ijw_incompatible_options ("${dirCompileOptions} " dirCompileOptions )
6565 set_directory_properties (PROPERTIES COMPILE_OPTIONS "${dirCompileOptions} " )
6666
67- # IJW tests needs to load DLLs from somewhere other than System32
68- string (REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} " )
69- string (REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} " )
70-
7167 set (CLR_SDK_REF_PACK_OUTPUT "" )
7268 set (CLR_SDK_REF_PACK_DISCOVERY_ERROR "" )
7369 set (CLR_SDK_REF_PACK_DISCOVERY_RESULT 0)
Original file line number Diff line number Diff line change @@ -433,10 +433,6 @@ if %__BuildNative% EQU 1 (
433433 goto ExitWithCode
434434 )
435435
436- @ REM Temporarily disabling PGO until updated files with new linker flag are available.
437- @ REM https://github.com/dotnet/runtime/pull/89311
438- GOTO :SkipNativeBuild
439-
440436 if %__EnforcePgo% EQU 1 (
441437 set PgoCheckCmd = " !PYTHON! " " !__ProjectDir! \scripts\pgocheck.py" " !__BinDir! \coreclr.dll" " !__BinDir! \clrjit.dll"
442438 echo !PgoCheckCmd!
Original file line number Diff line number Diff line change @@ -59,11 +59,9 @@ function(add_pgo TargetName)
5959 message ("Cannot use PGO optimization built with Ninja from MSBuild. Re-run build with Ninja to apply PGO information" )
6060 else (NOT EXISTS ${ProfilePath} )
6161 if (CLR_CMAKE_HOST_WIN32)
62- # Temporarily disabling PGO until updated files with new linker flag are available.
63- # https://github.com/dotnet/runtime/pull/89311
64- # set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELEASE " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
65- # set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELWITHDEBINFO " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
66- # add_compile_definitions(WITH_NATIVE_PGO)
62+ set_property (TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELEASE " /LTCG /USEPROFILE:PGD=\" ${ProfilePath} \" " )
63+ set_property (TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELWITHDEBINFO " /LTCG /USEPROFILE:PGD=\" ${ProfilePath} \" " )
64+ add_compile_definitions (WITH_NATIVE_PGO )
6765 else (CLR_CMAKE_HOST_WIN32 )
6866 if (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELWITHDEBINFO)
6967 if ((CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) AND (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16))
You can’t perform that action at this time.
0 commit comments