Skip to content

v4.8.5 proposal #15507

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

Closed
MylesBorins wants to merge 32 commits into from
Closed

v4.8.5 proposal #15507

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0b1df7e
deps/v8: add missing #include "unicode/normlzr.h"
ArchangeGabriel May 15, 2017
f4c5874
deps: cherry-pick 4ae5993 from upstream OpenSSL
shigeki May 9, 2017
64f5b73
deps: update openssl asm and asm_obsolete files
shigeki May 9, 2017
0bcd62b
v8: fix stack overflow in recursive method
bnoordhuis Apr 17, 2017
61f0464
crypto: clear err stack after ECDH::BufferToPoint
rfk May 29, 2017
40fb0da
build: avoid /docs/api and /docs/doc/api upload
rvagg May 11, 2017
8c9f1b3
tools: be explicit about including key-id
MylesBorins May 30, 2017
fd27dc7
doc: change `child` to `subprocess`
Trott Aug 1, 2017
244983a
doc: add entry for subprocess.killed property
Trott Aug 3, 2017
70f2299
build,tools: do not force codesign prefix
evanlucas Jul 12, 2017
dc05da7
build: codesign tarball binary on macOS
evanlucas Jul 12, 2017
dabc7c3
deps: cherry-pick 18ea996 from c-ares upstream
addaleax Jul 15, 2017
6fa2d7e
tools: update certdata.txt
bnoordhuis Apr 13, 2017
491f8c7
crypto: update root certificates
bnoordhuis Apr 13, 2017
fdcfc4c
tools: update certdata.txt
bnoordhuis May 29, 2017
fc6d118
crypto: update root certificates
bnoordhuis May 29, 2017
df23963
Revert "deps: backport e093a04, 09db540 from upstream V8"
abernix Aug 14, 2017
5d7f68a
deps: cherry-pick 09db540,686558d from V8 upstream
abernix Aug 14, 2017
0286833
deps: add example of comparing OpenSSL changes
danbev May 26, 2017
a5a8065
deps: upgrade openssl sources to 1.0.2l
danbev May 26, 2017
283dd73
deps: copy all openssl header files to include dir
danbev May 26, 2017
0bacd2d
deps: fix openssl assembly error on ia32 win32
indutny Jan 8, 2014
a4e947f
deps: fix asm build error of openssl in x86_win32
Feb 13, 2015
d93ef98
openssl: fix keypress requirement in apps on win32
Feb 17, 2015
c98f78d
deps: add -no_rand_screen to openssl s_client
May 27, 2015
df2ee21
deps: update openssl config files
danbev May 26, 2017
84a838e
deps: update openssl asm and asm_obsolete files
danbev Jun 1, 2017
273e02d
doc: add missing make command to UPGRADING.md
danbev May 30, 2017
2a8ef7a
zlib: fix node crashing on invalid options
aqrln May 22, 2017
5422eb8
zlib: fix crash when initializing failed
addaleax Aug 7, 2017
fc6145f
docs: Fix broken links in crypto.md
Sep 4, 2017
7648b22
2017-10-03, Version 4.8.5 'Argon' (Maintenance)
MylesBorins Sep 20, 2017
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
Prev Previous commit
Next Next commit
deps: fix asm build error of openssl in x86_win32 
See
https://mta.openssl.org/pipermail/openssl-dev/2015-February/000651.html

iojs needs to stop using masm and move to nasm or yasm on Win32.

Fixes: #589
Backport-PR-URL: #13696
PR-URL: #1389
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
@MylesBorins
Shigeki Ohtsu authored and MylesBorins committed Sep 19, 2017
commit a4e947fcf04776759905b45ea6042de30363393c
12 changes: 6 additions & 6 deletions deps/openssl/openssl/crypto/perlasm/x86masm.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ sub ::generic

if ($opcode =~ /lea/ && @arg[1] =~ s/.*PTR\s+(\(.*\))$/OFFSET $1/) # no []
{ $opcode="mov"; }
elsif ($opcode !~ /movq/)
elsif ($opcode !~ /mov[dq]$/)
{ # fix xmm references
$arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i);
$arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
$arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[-1]=~/\bxmm[0-7]\b/i);
$arg[-1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
}

&::emit($opcode,@arg);
Expand Down Expand Up @@ -160,13 +160,13 @@ sub ::public_label
{ push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n"); }

sub ::data_byte
{ push(@out,("DB\t").join(',',@_)."\n"); }
{ push(@out,("DB\t").join(',',splice(@_,0,16))."\n") while(@_); }

sub ::data_short
{ push(@out,("DW\t").join(',',@_)."\n"); }
{ push(@out,("DW\t").join(',',splice(@_,0,8))."\n") while(@_); }

sub ::data_word
{ push(@out,("DD\t").join(',',@_)."\n"); }
{ push(@out,("DD\t").join(',',splice(@_,0,4))."\n") while(@_); }

sub ::align
{ push(@out,"ALIGN\t$_[0]\n"); }
Expand Down