Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Windows executables: only load imported DLLs from System32" #95540

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Revert "Windows executables: only load imported DLLs from System32" #95540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions eng/native/configurecompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ if (MSVC)
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:$<TARGET_PROPERTY:CLR_EH_OPTION>>)
add_link_options($<$<BOOL:$<TARGET_PROPERTY:CLR_CONTROL_FLOW_GUARD>>:/guard:cf>)

# Load all imported DLLs from the System32 directory.
add_linker_flag(/DEPENDENTLOADFLAG:0x800)

# Linker flags
#
set (WINDOWS_SUBSYSTEM_VERSION 6.01)
Expand Down
4 changes: 0 additions & 4 deletions eng/native/ijw/IJW.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ if (CLR_CMAKE_HOST_WIN32)
remove_ijw_incompatible_options("${dirCompileOptions}" dirCompileOptions)
set_directory_properties(PROPERTIES COMPILE_OPTIONS "${dirCompileOptions}")

# IJW tests needs to load DLLs from somewhere other than System32
string(REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
string(REPLACE "/DEPENDENTLOADFLAG:0x800" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")

set(CLR_SDK_REF_PACK_OUTPUT "")
set(CLR_SDK_REF_PACK_DISCOVERY_ERROR "")
set(CLR_SDK_REF_PACK_DISCOVERY_RESULT 0)
Expand Down
4 changes: 0 additions & 4 deletions src/coreclr/build-runtime.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,10 +433,6 @@ if %__BuildNative% EQU 1 (
goto ExitWithCode
)

@REM Temporarily disabling PGO until updated files with new linker flag are available.
@REM https://github.com/dotnet/runtime/pull/89311
GOTO :SkipNativeBuild

if %__EnforcePgo% EQU 1 (
set PgoCheckCmd="!PYTHON!" "!__ProjectDir!\scripts\pgocheck.py" "!__BinDir!\coreclr.dll" "!__BinDir!\clrjit.dll"
echo !PgoCheckCmd!
Expand Down
8 changes: 3 additions & 5 deletions src/coreclr/pgosupport.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,9 @@ function(add_pgo TargetName)
message("Cannot use PGO optimization built with Ninja from MSBuild. Re-run build with Ninja to apply PGO information")
else(NOT EXISTS ${ProfilePath})
if(CLR_CMAKE_HOST_WIN32)
# Temporarily disabling PGO until updated files with new linker flag are available.
# https://github.com/dotnet/runtime/pull/89311
# set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELEASE " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
# set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELWITHDEBINFO " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
# add_compile_definitions(WITH_NATIVE_PGO)
set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELEASE " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
set_property(TARGET ${TargetName} APPEND_STRING PROPERTY LINK_FLAGS_RELWITHDEBINFO " /LTCG /USEPROFILE:PGD=\"${ProfilePath}\"")
add_compile_definitions(WITH_NATIVE_PGO)
else(CLR_CMAKE_HOST_WIN32)
if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELWITHDEBINFO)
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16))
Expand Down
Loading