diff options
Diffstat (limited to 'deps/openssl/config/archs/aix-gcc')
11 files changed, 328 insertions, 37 deletions
diff --git a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm index 9981f1bdc6..ddfb99209a 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm @@ -109,8 +109,8 @@ our %config = ( sourcedir => ".", target => "aix-gcc", tdirs => [ "ossl_shim" ], - version => "1.1.1a", - version_num => "0x1010101fL", + version => "1.1.1b", + version_num => "0x1010102fL", ); our %target = ( @@ -188,7 +188,7 @@ our %target = ( shared_defines => [ ], shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", shared_extension_simple => "", - shared_ldflag => "-shared -static-libgcc -Wl,-G,-bsymbolic", + shared_ldflag => "-shared -static-libgcc -Wl,-G,-bsymbolic,-bnoentry", shared_rcflag => "", shared_target => "self", sys_id => "AIX", @@ -260,6 +260,7 @@ our @disablables = ( "msan", "multiblock", "nextprotoneg", + "pinshared", "ocb", "ocsp", "pic", @@ -784,6 +785,11 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/bio_memleak_test" => + [ + "libcrypto", + "test/libtestutil.a", + ], "test/bioprinttest" => [ "libcrypto", @@ -1267,6 +1273,11 @@ our %unified_info = ( "libssl", "test/libtestutil.a", ], + "test/ec_internal_test" => + [ + "libcrypto.a", + "test/libtestutil.a", + ], "test/ecdsatest" => [ "libcrypto", @@ -9325,6 +9336,10 @@ our %unified_info = ( [ "include", ], + "test/bio_memleak_test.o" => + [ + "include", + ], "test/bioprinttest.o" => [ "include", @@ -9721,6 +9736,12 @@ our %unified_info = ( [ "include", ], + "test/ec_internal_test.o" => + [ + "include", + "crypto/ec", + "crypto/include", + ], "test/ecdsatest.o" => [ "include", @@ -10128,6 +10149,7 @@ our %unified_info = ( "test/bftest", "test/bio_callback_test", "test/bio_enc_test", + "test/bio_memleak_test", "test/bioprinttest", "test/bntest", "test/buildtest_aes", @@ -10223,6 +10245,7 @@ our %unified_info = ( "test/dtls_mtu_test", "test/dtlstest", "test/dtlsv1listentest", + "test/ec_internal_test", "test/ecdsatest", "test/ecstresstest", "test/ectest", @@ -14299,6 +14322,14 @@ our %unified_info = ( [ "test/bio_enc_test.c", ], + "test/bio_memleak_test" => + [ + "test/bio_memleak_test.o", + ], + "test/bio_memleak_test.o" => + [ + "test/bio_memleak_test.c", + ], "test/bioprinttest" => [ "test/bioprinttest.o", @@ -15066,6 +15097,14 @@ our %unified_info = ( [ "test/dtlsv1listentest.c", ], + "test/ec_internal_test" => + [ + "test/ec_internal_test.o", + ], + "test/ec_internal_test.o" => + [ + "test/ec_internal_test.c", + ], "test/ecdsatest" => [ "test/ecdsatest.o", 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 921b907b4e..63808012fd 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: Thu Nov 22 19:32:30 2018 UTC" +#define DATE "built on: Tue Feb 26 19:43:09 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 2eb7bd60a4..7dc64ca762 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s +++ b/deps/openssl/config/archs/aix-gcc/asm/crypto/ppccpuid.s @@ -95,15 +95,19 @@ Ladd: lwarx 5,0,3 .long 0 -.globl .OPENSSL_rdtsc +.globl .OPENSSL_rdtsc_mftb .align 4 -.OPENSSL_rdtsc: -Loop_rdtsc: - mftbu 5 +.OPENSSL_rdtsc_mftb: mftb 3 - mftbu 4 - cmplw 0,4,5 - bne Loop_rdtsc + blr +.long 0 +.byte 0,12,0x14,0,0,0,0,0 + + +.globl .OPENSSL_rdtsc_mfspr268 +.align 4 +.OPENSSL_rdtsc_mfspr268: + mfspr 3,268 blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -167,9 +171,9 @@ Lno_data: .byte 0,12,0x14,0,0,0,3,0 .long 0 -.globl .OPENSSL_instrument_bus +.globl .OPENSSL_instrument_bus_mftb .align 4 -.OPENSSL_instrument_bus: +.OPENSSL_instrument_bus_mftb: mtctr 4 mftb 7 @@ -199,9 +203,9 @@ Loop: mftb 6 .long 0 -.globl .OPENSSL_instrument_bus2 +.globl .OPENSSL_instrument_bus2_mftb .align 4 -.OPENSSL_instrument_bus2: +.OPENSSL_instrument_bus2_mftb: mr 0,4 slwi 4,4,2 @@ -250,3 +254,86 @@ Ldone2: .byte 0,12,0x14,0,0,0,3,0 .long 0 + +.globl .OPENSSL_instrument_bus_mfspr268 +.align 4 +.OPENSSL_instrument_bus_mfspr268: + mtctr 4 + + mfspr 7,268 + li 8,0 + + dcbf 0,3 + lwarx 6,0,3 + add 6,6,8 + stwcx. 6,0,3 + stwx 6,0,3 + +Loop3: mfspr 6,268 + sub 8,6,7 + mr 7,6 + dcbf 0,3 + lwarx 6,0,3 + add 6,6,8 + stwcx. 6,0,3 + stwx 6,0,3 + addi 3,3,4 + bc 16,0,Loop3 + + mr 3,4 + blr +.long 0 +.byte 0,12,0x14,0,0,0,2,0 +.long 0 + + +.globl .OPENSSL_instrument_bus2_mfspr268 +.align 4 +.OPENSSL_instrument_bus2_mfspr268: + mr 0,4 + slwi 4,4,2 + + mfspr 7,268 + li 8,0 + + dcbf 0,3 + lwarx 6,0,3 + add 6,6,8 + stwcx. 6,0,3 + stwx 6,0,3 + + mfspr 6,268 + sub 8,6,7 + mr 7,6 + mr 9,8 +Loop4: + dcbf 0,3 + lwarx 6,0,3 + add 6,6,8 + stwcx. 6,0,3 + stwx 6,0,3 + + addic. 5,5,-1 + beq Ldone4 + + mfspr 6,268 + sub 8,6,7 + mr 7,6 + cmplw 7,8,9 + mr 9,8 + + mfcr 6 + not 6,6 + rlwinm 6,6,1,29,29 + + sub. 4,4,6 + add 3,3,6 + bne Loop4 + +Ldone4: + srwi 4,4,2 + sub 3,0,4 + 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/progs.h b/deps/openssl/config/archs/aix-gcc/asm/include/progs.h index 0d382187ba..9b3d270e20 100644 --- a/deps/openssl/config/archs/aix-gcc/asm/include/progs.h +++ b/deps/openssl/config/archs/aix-gcc/asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm index 5a7e477ff4..a4e46d9698 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm @@ -109,8 +109,8 @@ our %config = ( sourcedir => ".", target => "aix-gcc", tdirs => [ "ossl_shim" ], - version => "1.1.1a", - version_num => "0x1010101fL", + version => "1.1.1b", + version_num => "0x1010102fL", ); our %target = ( @@ -188,7 +188,7 @@ our %target = ( shared_defines => [ ], shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", shared_extension_simple => "", - shared_ldflag => "-shared -static-libgcc -Wl,-G,-bsymbolic", + shared_ldflag => "-shared -static-libgcc -Wl,-G,-bsymbolic,-bnoentry", shared_rcflag => "", shared_target => "self", sys_id => "AIX", @@ -260,6 +260,7 @@ our @disablables = ( "msan", "multiblock", "nextprotoneg", + "pinshared", "ocb", "ocsp", "pic", @@ -784,6 +785,11 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/bio_memleak_test" => + [ + "libcrypto", + "test/libtestutil.a", + ], "test/bioprinttest" => [ "libcrypto", @@ -1267,6 +1273,11 @@ our %unified_info = ( "libssl", "test/libtestutil.a", ], + "test/ec_internal_test" => + [ + "libcrypto.a", + "test/libtestutil.a", + ], "test/ecdsatest" => [ "libcrypto", @@ -9325,6 +9336,10 @@ our %unified_info = ( [ "include", ], + "test/bio_memleak_test.o" => + [ + "include", + ], "test/bioprinttest.o" => [ "include", @@ -9721,6 +9736,12 @@ our %unified_info = ( [ "include", ], + "test/ec_internal_test.o" => + [ + "include", + "crypto/ec", + "crypto/include", + ], "test/ecdsatest.o" => [ "include", @@ -10128,6 +10149,7 @@ our %unified_info = ( "test/bftest", "test/bio_callback_test", "test/bio_enc_test", + "test/bio_memleak_test", "test/bioprinttest", "test/bntest", "test/buildtest_aes", @@ -10223,6 +10245,7 @@ our %unified_info = ( "test/dtls_mtu_test", "test/dtlstest", "test/dtlsv1listentest", + "test/ec_internal_test", "test/ecdsatest", "test/ecstresstest", "test/ectest", @@ -14299,6 +14322,14 @@ our %unified_info = ( [ "test/bio_enc_test.c", ], + "test/bio_memleak_test" => + [ + "test/bio_memleak_test.o", + ], + "test/bio_memleak_test.o" => + [ + "test/bio_memleak_test.c", + ], "test/bioprinttest" => [ "test/bioprinttest.o", @@ -15066,6 +15097,14 @@ our %unified_info = ( [ "test/dtlsv1listentest.c", ], + "test/ec_internal_test" => + [ + "test/ec_internal_test.o", + ], + "test/ec_internal_test.o" => + [ + "test/ec_internal_test.c", + ], "test/ecdsatest" => [ "test/ecdsatest.o", diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h index ca8cb250bd..c923190eb9 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Thu Nov 22 19:32:33 2018 UTC" +#define DATE "built on: Tue Feb 26 19:43:22 2019 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/ppccpuid.s b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/ppccpuid.s index 2eb7bd60a4..7dc64ca762 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/ppccpuid.s +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/ppccpuid.s @@ -95,15 +95,19 @@ Ladd: lwarx 5,0,3 .long 0 -.globl .OPENSSL_rdtsc +.globl .OPENSSL_rdtsc_mftb .align 4 -.OPENSSL_rdtsc: -Loop_rdtsc: - mftbu 5 +.OPENSSL_rdtsc_mftb: mftb 3 - mftbu 4 - cmplw 0,4,5 - bne Loop_rdtsc + blr +.long 0 +.byte 0,12,0x14,0,0,0,0,0 + + +.globl .OPENSSL_rdtsc_mfspr268 +.align 4 +.OPENSSL_rdtsc_mfspr268: + mfspr 3,268 blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -167,9 +171,9 @@ Lno_data: .byte 0,12,0x14,0,0,0,3,0 .long 0 -.globl .OPENSSL_instrument_bus +.globl .OPENSSL_instrument_bus_mftb .align 4 -.OPENSSL_instrument_bus: +.OPENSSL_instrument_bus_mftb: mtctr 4 mftb 7 @@ -199,9 +203,9 @@ Loop: mftb 6 .long 0 -.globl .OPENSSL_instrument_bus2 +.globl .OPENSSL_instrument_bus2_mftb .align 4 -.OPENSSL_instrument_bus2: +.OPENSSL_instrument_bus2_mftb: mr 0,4 slwi 4,4,2 @@ -250,3 +254,86 @@ Ldone2: .byte 0,12,0x14,0,0,0,3,0 .long 0 + +.globl .OPENSSL_instrument_bus_mfspr268 +.align 4 +.OPENSSL_instrument_bus_mfspr268: + mtctr 4 + + mfspr 7,268 + li 8,0 + + dcbf 0,3 + lwarx 6,0,3 + add 6,6,8 + stwcx. 6,0,3 + stwx 6,0,3 + +Loop3: mfspr 6,268 + sub 8,6,7 + mr 7,6 + dcbf 0,3 + lwarx 6,0,3 + add 6,6,8 + stwcx. 6,0,3 + stwx 6,0,3 + addi 3,3,4 + bc 16,0,Loop3 + + mr 3,4 + blr +.long 0 +.byte 0,12,0x14,0,0,0,2,0 +.long 0 + + +.globl .OPENSSL_instrument_bus2_mfspr268 +.align 4 +.OPENSSL_instrument_bus2_mfspr268: + mr 0,4 + slwi 4,4,2 + + mfspr 7,268 + li 8,0 + + dcbf 0,3 + lwarx 6,0,3 + add 6,6,8 + stwcx. 6,0,3 + stwx 6,0,3 + + mfspr 6,268 + sub 8,6,7 + mr 7,6 + mr 9,8 +Loop4: + dcbf 0,3 + lwarx 6,0,3 + add 6,6,8 + stwcx. 6,0,3 + stwx 6,0,3 + + addic. 5,5,-1 + beq Ldone4 + + mfspr 6,268 + sub 8,6,7 + mr 7,6 + cmplw 7,8,9 + mr 9,8 + + mfcr 6 + not 6,6 + rlwinm 6,6,1,29,29 + + sub. 4,4,6 + add 3,3,6 + bne Loop4 + +Ldone4: + srwi 4,4,2 + sub 3,0,4 + blr +.long 0 +.byte 0,12,0x14,0,0,0,3,0 +.long 0 diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h index 0d382187ba..9b3d270e20 100644 --- a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h +++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm index 161083c5fa..afa6bab335 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm +++ b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm @@ -109,8 +109,8 @@ our %config = ( sourcedir => ".", target => "aix-gcc", tdirs => [ "ossl_shim" ], - version => "1.1.1a", - version_num => "0x1010101fL", + version => "1.1.1b", + version_num => "0x1010102fL", ); our %target = ( @@ -186,7 +186,7 @@ our %target = ( shared_defines => [ ], shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)", shared_extension_simple => "", - shared_ldflag => "-shared -static-libgcc -Wl,-G,-bsymbolic", + shared_ldflag => "-shared -static-libgcc -Wl,-G,-bsymbolic,-bnoentry", shared_rcflag => "", shared_target => "self", sys_id => "AIX", @@ -258,6 +258,7 @@ our @disablables = ( "msan", "multiblock", "nextprotoneg", + "pinshared", "ocb", "ocsp", "pic", @@ -783,6 +784,11 @@ our %unified_info = ( "libcrypto", "test/libtestutil.a", ], + "test/bio_memleak_test" => + [ + "libcrypto", + "test/libtestutil.a", + ], "test/bioprinttest" => [ "libcrypto", @@ -1266,6 +1272,11 @@ our %unified_info = ( "libssl", "test/libtestutil.a", ], + "test/ec_internal_test" => + [ + "libcrypto.a", + "test/libtestutil.a", + ], "test/ecdsatest" => [ "libcrypto", @@ -9233,6 +9244,10 @@ our %unified_info = ( [ "include", ], + "test/bio_memleak_test.o" => + [ + "include", + ], "test/bioprinttest.o" => [ "include", @@ -9629,6 +9644,12 @@ our %unified_info = ( [ "include", ], + "test/ec_internal_test.o" => + [ + "include", + "crypto/ec", + "crypto/include", + ], "test/ecdsatest.o" => [ "include", @@ -10036,6 +10057,7 @@ our %unified_info = ( "test/bftest", "test/bio_callback_test", "test/bio_enc_test", + "test/bio_memleak_test", "test/bioprinttest", "test/bntest", "test/buildtest_aes", @@ -10131,6 +10153,7 @@ our %unified_info = ( "test/dtls_mtu_test", "test/dtlstest", "test/dtlsv1listentest", + "test/ec_internal_test", "test/ecdsatest", "test/ecstresstest", "test/ectest", @@ -14142,6 +14165,14 @@ our %unified_info = ( [ "test/bio_enc_test.c", ], + "test/bio_memleak_test" => + [ + "test/bio_memleak_test.o", + ], + "test/bio_memleak_test.o" => + [ + "test/bio_memleak_test.c", + ], "test/bioprinttest" => [ "test/bioprinttest.o", @@ -14909,6 +14940,14 @@ our %unified_info = ( [ "test/dtlsv1listentest.c", ], + "test/ec_internal_test" => + [ + "test/ec_internal_test.o", + ], + "test/ec_internal_test.o" => + [ + "test/ec_internal_test.c", + ], "test/ecdsatest" => [ "test/ecdsatest.o", diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h index 32e747f697..454bd37a75 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h @@ -11,7 +11,7 @@ */ #define PLATFORM "platform: aix-gcc" -#define DATE "built on: Thu Nov 22 19:32:36 2018 UTC" +#define DATE "built on: Tue Feb 26 19:43:36 2019 UTC" /* * Generate compiler_flags as an array of individual characters. This is a diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h index 0d382187ba..9b3d270e20 100644 --- a/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h +++ b/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by apps/progs.pl * - * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy |