Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nodejs/node into i-32845
Browse files Browse the repository at this point in the history
  • Loading branch information
@rexagod
rexagod committed Apr 27, 2020
2 parents 9fdb1a6 + 684a81d commit 764bda7
Show file tree
Hide file tree
Showing 205 changed files with 2,499 additions and 957 deletions.
2 changes: 1 addition & 1 deletion common.gypi
View file
Expand Up @@ -35,7 +35,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.13',
'v8_embedder_string': '-node.14',

##### V8 defaults for Node.js #####

Expand Down
5 changes: 3 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm/configdata.pm
View file
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand Down Expand Up @@ -7413,6 +7413,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Mar 31 13:06:25 2020 UTC"
#define DATE "built on: Tue Apr 21 13:28:30 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
5 changes: 3 additions & 2 deletions deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
View file
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand Down Expand Up @@ -7413,6 +7413,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Mar 31 13:06:27 2020 UTC"
#define DATE "built on: Tue Apr 21 13:28:32 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
5 changes: 3 additions & 2 deletions deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm
View file
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand Down Expand Up @@ -7363,6 +7363,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86"
#define DATE "built on: Tue Mar 31 13:06:30 2020 UTC"
#define DATE "built on: Tue Apr 21 13:28:34 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
5 changes: 3 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
View file
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand Down Expand Up @@ -7502,6 +7502,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Tue Mar 31 13:06:31 2020 UTC"
#define DATE "built on: Tue Apr 21 13:28:35 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
5 changes: 3 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm
View file
Expand Up @@ -111,8 +111,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand Down Expand Up @@ -7502,6 +7502,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Tue Mar 31 13:06:37 2020 UTC"
#define DATE "built on: Tue Apr 21 13:28:40 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
5 changes: 3 additions & 2 deletions deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm
View file
Expand Up @@ -110,8 +110,8 @@ our %config = (
sourcedir => ".",
target => "BSD-x86_64",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand Down Expand Up @@ -7384,6 +7384,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: BSD-x86_64"
#define DATE "built on: Tue Mar 31 13:06:43 2020 UTC"
#define DATE "built on: Tue Apr 21 13:28:45 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
7 changes: 4 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/asm/configdata.pm
View file
Expand Up @@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55e4d97a23c8)",
RANLIB => "CODE(0x555663f9f6e8)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
Expand Down Expand Up @@ -7460,6 +7460,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Mar 31 13:08:59 2020 UTC"
#define DATE "built on: Tue Apr 21 13:30:38 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
7 changes: 4 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm
View file
Expand Up @@ -115,8 +115,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand All @@ -132,7 +132,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55e7fe7b8518)",
RANLIB => "CODE(0x557555fd4548)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
Expand Down Expand Up @@ -7460,6 +7460,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Mar 31 13:09:01 2020 UTC"
#define DATE "built on: Tue Apr 21 13:30:40 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
7 changes: 4 additions & 3 deletions deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm
View file
Expand Up @@ -114,8 +114,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN32",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand All @@ -131,7 +131,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x56297fab3cf8)",
RANLIB => "CODE(0x55b7cbf3ba68)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
aes_asm_src => "aes_core.c aes_cbc.c",
Expand Down Expand Up @@ -7410,6 +7410,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Mar 31 13:09:04 2020 UTC"
#define DATE "built on: Tue Apr 21 13:30:42 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
7 changes: 4 additions & 3 deletions deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm
View file
Expand Up @@ -113,8 +113,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64-ARM",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand All @@ -128,7 +128,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55d021518948)",
RANLIB => "CODE(0x561bd9d97ee8)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/50-win-onecore.conf", "Configurations/shared-info.pl" ],
aes_asm_src => "aes_core.c aes_cbc.c",
Expand Down Expand Up @@ -7404,6 +7404,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: VC-WIN64-ARM"
#define DATE "built on: Tue Mar 31 13:09:05 2020 UTC"
#define DATE "built on: Tue Apr 21 13:30:43 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
7 changes: 4 additions & 3 deletions deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm
View file
Expand Up @@ -116,8 +116,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64A",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand All @@ -133,7 +133,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x5636e84e0f08)",
RANLIB => "CODE(0x5647ca1193c8)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
Expand Down Expand Up @@ -7517,6 +7517,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Mar 31 13:08:44 2020 UTC"
#define DATE "built on: Tue Apr 21 13:30:25 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down
7 changes: 4 additions & 3 deletions deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm
View file
Expand Up @@ -116,8 +116,8 @@ our %config = (
sourcedir => ".",
target => "VC-WIN64A",
tdirs => [ "ossl_shim" ],
version => "1.1.1f",
version_num => "0x1010106fL",
version => "1.1.1g",
version_num => "0x1010107fL",
);

our %target = (
Expand All @@ -133,7 +133,7 @@ our %target = (
LDFLAGS => "/nologo /debug",
MT => "mt",
MTFLAGS => "-nologo",
RANLIB => "CODE(0x55c9eeaa7548)",
RANLIB => "CODE(0x55fd09262448)",
RC => "rc",
_conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
Expand Down Expand Up @@ -7517,6 +7517,7 @@ our %unified_info = (
[
".",
"include",
"crypto/modes",
],
"crypto/rand/drbg_lib.o" =>
[
Expand Down
2 changes: 1 addition & 1 deletion deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h
View file
Expand Up @@ -11,7 +11,7 @@
*/

#define PLATFORM "platform: "
#define DATE "built on: Tue Mar 31 13:08:50 2020 UTC"
#define DATE "built on: Tue Apr 21 13:30:31 2020 UTC"

/*
* Generate compiler_flags as an array of individual characters. This is a
Expand Down

0 comments on commit 764bda7

Please sign in to comment.