forked from dotnet/runtime
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Give end-marker symbols their own addresses to fix a linker bug
It seems there is a linker bug related to control-flow guard that is causing dotnet#66969. In eb8460f a thunktemplates.asm file was added that has a LEAF_END_MARKED at the end of the file. This creates two symbols for the same upcoming address. Normally that should be fine, but in this case it causes the linker to place the same address twice in a CFG table in the PE file. This causes the kernel to fail while loading the image. A simple workaround would be to add a nop at the end of thunktemplates.asm, but @janvorli suggested giving these symbols their own address in all cases for goodness when debugging. We already do so for Windows x64 it looks like. Fix dotnet#66969
- Loading branch information
1 parent
a484644
commit f05c8f4
Showing
7 changed files
with
16 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -51,6 +51,8 @@ C_FUNC(\Name): | |
.macro LEAF_END_MARKED Name, Section | ||
C_FUNC(\Name\()_End): | ||
.global C_FUNC(\Name\()_End) | ||
; make sure this symbol gets its own address | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
jakobbotsch
Author
Owner
|
||
nop | ||
LEAF_END \Name, \Section | ||
.endm | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Can you please put the
nop
after the LEAF_END in all cases?