summaryrefslogtreecommitdiff
path: root/deps/openssl/config/archs/aix-gcc/asm
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2019-04-23 16:44:55 -0700
committerSam Roberts <vieuxtech@gmail.com>2019-04-29 10:57:43 -0700
commit439bc6ee0ee84ddb93767d5b6d96ce1bc9ded3e8 (patch)
tree790268f731404170cc093f6bf861f949492e3c4a /deps/openssl/config/archs/aix-gcc/asm
parent8a4e4a4242a7ab2df44eb535a019d38f2852c108 (diff)
downloadandroid-node-v8-439bc6ee0ee84ddb93767d5b6d96ce1bc9ded3e8.tar.gz
android-node-v8-439bc6ee0ee84ddb93767d5b6d96ce1bc9ded3e8.tar.bz2
android-node-v8-439bc6ee0ee84ddb93767d5b6d96ce1bc9ded3e8.zip
deps: update archs files for OpenSSL-1.1.1b
Ran: $ cd deps/openssl/config; make to update deps/openssl/config/archs/ with current configuration. PR-URL: https://github.com/nodejs/node/pull/27376 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Diffstat (limited to 'deps/openssl/config/archs/aix-gcc/asm')
-rw-r--r--deps/openssl/config/archs/aix-gcc/asm/configdata.pm10
-rw-r--r--deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h2
-rw-r--r--deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s7
-rw-r--r--deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h3
4 files changed, 8 insertions, 14 deletions
diff --git a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm
index ddfb99209a..4c2e464fc0 100644
--- a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm
+++ b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm
@@ -53,15 +53,15 @@ our %config = (
minor => "1.1",
openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
openssl_api_defines => [ ],
- openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL_TRACE", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+ openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
openssl_sys_defines => [ "OPENSSL_SYS_AIX" ],
openssl_thread_defines => [ "OPENSSL_THREADS" ],
openssldir => "",
- options => " no-afalgeng no-asan no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl-trace no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
+ options => "enable-ssl-trace no-afalgeng no-asan no-comp no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-dynamic-engine no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-shared no-ssl3 no-ssl3-method no-ubsan no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic",
perl_archname => "x86_64-linux-gnu-thread-multi",
perl_cmd => "/usr/bin/perl",
perl_version => "5.26.2",
- perlargv => [ "no-comp", "no-shared", "no-afalgeng", "aix-gcc" ],
+ perlargv => [ "no-comp", "no-shared", "no-afalgeng", "enable-ssl-trace", "aix-gcc" ],
perlenv => {
"AR" => undef,
"ARFLAGS" => undef,
@@ -334,7 +334,6 @@ our %disabled = (
"rc5" => "default",
"sctp" => "default",
"shared" => "option",
- "ssl-trace" => "default",
"ssl3" => "default",
"ssl3-method" => "default",
"ubsan" => "default",
@@ -15820,9 +15819,6 @@ my %disabled_info = (
'sctp' => {
macro => 'OPENSSL_NO_SCTP',
},
- 'ssl-trace' => {
- macro => 'OPENSSL_NO_SSL_TRACE',
- },
'ssl3' => {
macro => 'OPENSSL_NO_SSL3',
},
diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h
index 63808012fd..a9e8563542 100644
--- a/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
*/
#define PLATFORM "platform: aix-gcc"
-#define DATE "built on: Tue Feb 26 19:43:09 2019 UTC"
+#define DATE "built on: Thu Apr 25 22:45:32 2019 UTC"
/*
* Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s b/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s
index 7dc64ca762..3ed5632d9c 100644
--- a/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s
+++ b/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s
@@ -99,7 +99,7 @@ Ladd: lwarx 5,0,3
.align 4
.OPENSSL_rdtsc_mftb:
mftb 3
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,0,0
@@ -281,7 +281,7 @@ Loop3: mfspr 6,268
bc 16,0,Loop3
mr 3,4
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,2,0
.long 0
@@ -333,7 +333,8 @@ Loop4:
Ldone4:
srwi 4,4,2
sub 3,0,4
- blr
+ blr
.long 0
.byte 0,12,0x14,0,0,0,3,0
.long 0
+
diff --git a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h
index e7861bdb60..683c468946 100644
--- a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h
@@ -81,9 +81,6 @@ extern "C" {
#ifndef OPENSSL_NO_SCTP
# define OPENSSL_NO_SCTP
#endif
-#ifndef OPENSSL_NO_SSL_TRACE
-# define OPENSSL_NO_SSL_TRACE
-#endif
#ifndef OPENSSL_NO_SSL3
# define OPENSSL_NO_SSL3
#endif