Uh oh!
There was an error while loading. Please reload this page.
Backport/gh 7427 - #8399
Closed
indutny wants to merge 2 commits into
Closed
Conversation
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 <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Bert Belder <bertbelder@gmail.com>
`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 <info@bnoordhuis.nl> Reviewed-By: Robert Jefe Lindstaedt <robert.lindstaedt@gmail.com> Reviewed-By: Minwoo Jung <jmwsoft@gmail.com>
4 tasks
jasnell
commented
Sep 4, 2016
Member
LGTM if CI is green. |
indutny
commented
Sep 4, 2016
MemberAuthor
CI: https://ci.nodejs.org/job/node-test-pull-request/3938/ |
indutny
commented
Sep 4, 2016
MemberAuthor
CI is green except some unrelated failures on ARM. Landing. |
indutny
commented
Sep 4, 2016
MemberAuthor
Ah, actually. @Fishrock123 I'll let you land this one when you'll be ready for it :) |
Fishrock123
commented
Sep 4, 2016
Contributor
@indutny huh? Why would I be landing this? If it is ready you can land it directly onto |
indutny
commented
Sep 4, 2016
MemberAuthor
Oops, meant @thealphanerd . Sorry! |
MylesBorins
commented
Sep 4, 2016
Contributor
landed in 7e60292...09099ab |
indutny
commented
Sep 4, 2016
MemberAuthor
Hooray, thanks everyone! |
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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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