Backport/gh 7427 #8399
Closed
Backport/gh 7427 #8399
Conversation
This file contains hidden or 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
Use `msvs_settings.MASM.UseSafeExceptionHandlers` when building OpenSSL assembly code on Windows. This option appends `/safeseh` to the list of assembler flags when building `.asm` files on Windows. Having this option in place, separate rules in `masm_compile.gypi` are no longer needed. Fix: nodejs#7426 PR-URL: nodejs#7427 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Bert Belder <[email protected]>
`ml64.exe` doesn't support `/safeseh` option. Do not attempt to use it if `target_arch=="x64"`. See: https://msdn.microsoft.com/en-us/library/s0ksfwcf.aspx PR-URL: nodejs#7759 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Robert Jefe Lindstaedt <[email protected]> Reviewed-By: Minwoo Jung <[email protected]>
nodejs-github-bot
added
the
openssl
4 tasks
|
LGTM if CI is green. |
|
CI: https://ci.nodejs.org/job/node-test-pull-request/3938/ |
|
CI is green except some unrelated failures on ARM. Landing. |
|
Ah, actually. @Fishrock123 I'll let you land this one when you'll be ready for it :) |
|
@indutny huh? Why would I be landing this? If it is ready you can land it directly onto |
|
Oops, meant @thealphanerd . Sorry! |
|
landed in 7e60292...09099ab |
|
Hooray, thanks everyone! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
make -j4 test(UNIX), orvcbuild test nosign(Windows) passesAffected core subsystem(s)
deps
Description of change
Backport of two commits from the master branch.
cc @thealphanerd