From d68c4e9103e9bff1513a72d2d164ac4db74897d7 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 14 Apr 2022 12:58:12 +0200 Subject: [PATCH] deps: remove aix-gcc architecture PR-URL: https://github.com/nodejs/node/pull/42616 Fixes: https://github.com/nodejs/node/issues/42081 Reviewed-By: James M Snell Reviewed-By: Richard Lau --- deps/openssl/README.md | 1 - deps/openssl/config/Makefile | 2 +- deps/openssl/config/asn1_asm.h | 2 -- deps/openssl/config/asn1_no-asm.h | 2 -- deps/openssl/config/asn1t_asm.h | 2 -- deps/openssl/config/asn1t_no-asm.h | 2 -- deps/openssl/config/bio_asm.h | 2 -- deps/openssl/config/bio_no-asm.h | 2 -- deps/openssl/config/bn_conf_asm.h | 2 -- deps/openssl/config/bn_conf_no-asm.h | 2 -- deps/openssl/config/cmp_asm.h | 2 -- deps/openssl/config/cmp_no-asm.h | 2 -- deps/openssl/config/cms_asm.h | 2 -- deps/openssl/config/cms_no-asm.h | 2 -- deps/openssl/config/conf_asm.h | 2 -- deps/openssl/config/conf_no-asm.h | 2 -- deps/openssl/config/configuration_asm.h | 2 -- deps/openssl/config/configuration_no-asm.h | 2 -- deps/openssl/config/crmf_asm.h | 2 -- deps/openssl/config/crmf_no-asm.h | 2 -- deps/openssl/config/crypto_asm.h | 2 -- deps/openssl/config/crypto_no-asm.h | 2 -- deps/openssl/config/ct_asm.h | 2 -- deps/openssl/config/ct_no-asm.h | 2 -- deps/openssl/config/dso_conf_asm.h | 2 -- deps/openssl/config/dso_conf_no-asm.h | 2 -- deps/openssl/config/err_asm.h | 2 -- deps/openssl/config/err_no-asm.h | 2 -- deps/openssl/config/ess_asm.h | 2 -- deps/openssl/config/ess_no-asm.h | 2 -- deps/openssl/config/fipskey_asm.h | 2 -- deps/openssl/config/fipskey_no-asm.h | 2 -- deps/openssl/config/include_asm.h.tmpl | 2 -- deps/openssl/config/include_no-asm.h.tmpl | 2 -- deps/openssl/config/lhash_asm.h | 2 -- deps/openssl/config/lhash_no-asm.h | 2 -- deps/openssl/config/ocsp_asm.h | 2 -- deps/openssl/config/ocsp_no-asm.h | 2 -- deps/openssl/config/opensslv_asm.h | 2 -- deps/openssl/config/opensslv_no-asm.h | 2 -- deps/openssl/config/pkcs12_asm.h | 2 -- deps/openssl/config/pkcs12_no-asm.h | 2 -- deps/openssl/config/pkcs7_asm.h | 2 -- deps/openssl/config/pkcs7_no-asm.h | 2 -- deps/openssl/config/safestack_asm.h | 2 -- deps/openssl/config/safestack_no-asm.h | 2 -- deps/openssl/config/srp_asm.h | 2 -- deps/openssl/config/srp_no-asm.h | 2 -- deps/openssl/config/ssl_asm.h | 2 -- deps/openssl/config/ssl_no-asm.h | 2 -- deps/openssl/config/ui_asm.h | 2 -- deps/openssl/config/ui_no-asm.h | 2 -- deps/openssl/config/x509_asm.h | 2 -- deps/openssl/config/x509_no-asm.h | 2 -- deps/openssl/config/x509_vfy_asm.h | 2 -- deps/openssl/config/x509_vfy_no-asm.h | 2 -- deps/openssl/config/x509v3_asm.h | 2 -- deps/openssl/config/x509v3_no-asm.h | 2 -- 58 files changed, 1 insertion(+), 114 deletions(-) diff --git a/deps/openssl/README.md b/deps/openssl/README.md index d2d1d26c18..e995e70ba9 100644 --- a/deps/openssl/README.md +++ b/deps/openssl/README.md @@ -45,7 +45,6 @@ Here is a list of supported architectures for use of ASM in OpenSSL. | --dest-os | --dest-cpu | OpenSSL target arch | CI | | --------- | ---------- | -------------------- | --- | - | aix | ppc | aix-gcc | o | | aix | ppc64 | aix64-gcc | o | | linux | ia32 | linux-elf | o | | linux | x32 | linux-x32 | - | diff --git a/deps/openssl/config/Makefile b/deps/openssl/config/Makefile index 704ca17d9f..91aa1a37fa 100644 --- a/deps/openssl/config/Makefile +++ b/deps/openssl/config/Makefile @@ -9,7 +9,7 @@ endif PERL = perl # Supported architecture list -ASM_ARCHS = aix-gcc aix64-gcc-as BSD-x86 BSD-x86_64 \ +ASM_ARCHS = aix64-gcc-as BSD-x86 BSD-x86_64 \ darwin64-x86_64-cc darwin-i386-cc darwin64-arm64-cc linux-aarch64 \ linux-armv4 linux-elf linux-x86_64 linux-ppc \ linux-ppc64 linux-ppc64le linux32-s390x linux64-s390x linux64-mips64\ diff --git a/deps/openssl/config/asn1_asm.h b/deps/openssl/config/asn1_asm.h index b60bb86cc9..20e385faac 100644 --- a/deps/openssl/config/asn1_asm.h +++ b/deps/openssl/config/asn1_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/asn1.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/asn1.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/asn1.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/asn1.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/asn1_no-asm.h b/deps/openssl/config/asn1_no-asm.h index 7e520876f1..fbb70cf8e7 100644 --- a/deps/openssl/config/asn1_no-asm.h +++ b/deps/openssl/config/asn1_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/asn1.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/asn1.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/asn1.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/asn1.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/asn1t_asm.h b/deps/openssl/config/asn1t_asm.h index 0d3e3bdc8f..8ce4eb056e 100644 --- a/deps/openssl/config/asn1t_asm.h +++ b/deps/openssl/config/asn1t_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/asn1t.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/asn1t.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/asn1t.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/asn1t.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/asn1t_no-asm.h b/deps/openssl/config/asn1t_no-asm.h index d471b656a6..2e014020e8 100644 --- a/deps/openssl/config/asn1t_no-asm.h +++ b/deps/openssl/config/asn1t_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/asn1t.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/asn1t.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/asn1t.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/asn1t.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/bio_asm.h b/deps/openssl/config/bio_asm.h index 19b4764b1b..effd479c21 100644 --- a/deps/openssl/config/bio_asm.h +++ b/deps/openssl/config/bio_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/bio.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/bio.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/bio.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/bio.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/bio_no-asm.h b/deps/openssl/config/bio_no-asm.h index 7df408acc3..0caedd9295 100644 --- a/deps/openssl/config/bio_no-asm.h +++ b/deps/openssl/config/bio_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/bio.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/bio.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/bio.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/bio.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/bn_conf_asm.h b/deps/openssl/config/bn_conf_asm.h index 85ecbacf3a..7c706e1d36 100644 --- a/deps/openssl/config/bn_conf_asm.h +++ b/deps/openssl/config/bn_conf_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/crypto/bn_conf.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/crypto/bn_conf.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/crypto/bn_conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/crypto/bn_conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/bn_conf_no-asm.h b/deps/openssl/config/bn_conf_no-asm.h index 06ab3d268c..1e616a1eba 100644 --- a/deps/openssl/config/bn_conf_no-asm.h +++ b/deps/openssl/config/bn_conf_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/crypto/bn_conf.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/crypto/bn_conf.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/crypto/bn_conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/crypto/bn_conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/cmp_asm.h b/deps/openssl/config/cmp_asm.h index e78ec14eb9..70802e8f69 100644 --- a/deps/openssl/config/cmp_asm.h +++ b/deps/openssl/config/cmp_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/cmp.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/cmp.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/cmp.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/cmp.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/cmp_no-asm.h b/deps/openssl/config/cmp_no-asm.h index 2dd84b8deb..02054dcf06 100644 --- a/deps/openssl/config/cmp_no-asm.h +++ b/deps/openssl/config/cmp_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/cmp.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/cmp.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/cmp.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/cmp.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/cms_asm.h b/deps/openssl/config/cms_asm.h index 8a23ad5009..67e790ef9b 100644 --- a/deps/openssl/config/cms_asm.h +++ b/deps/openssl/config/cms_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/cms.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/cms.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/cms.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/cms.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/cms_no-asm.h b/deps/openssl/config/cms_no-asm.h index 2507391663..6d59d8a6dd 100644 --- a/deps/openssl/config/cms_no-asm.h +++ b/deps/openssl/config/cms_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/cms.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/cms.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/cms.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/cms.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/conf_asm.h b/deps/openssl/config/conf_asm.h index 1e85a17fd4..9be2f0d0a9 100644 --- a/deps/openssl/config/conf_asm.h +++ b/deps/openssl/config/conf_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/conf.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/conf.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/conf_no-asm.h b/deps/openssl/config/conf_no-asm.h index 483d49164b..d467b2ced0 100644 --- a/deps/openssl/config/conf_no-asm.h +++ b/deps/openssl/config/conf_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/conf.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/conf.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/configuration_asm.h b/deps/openssl/config/configuration_asm.h index dcc0a495a0..9bd73473a2 100644 --- a/deps/openssl/config/configuration_asm.h +++ b/deps/openssl/config/configuration_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/configuration.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/configuration.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/configuration.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/configuration.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/configuration_no-asm.h b/deps/openssl/config/configuration_no-asm.h index 0dc73e9e17..99f8afb51e 100644 --- a/deps/openssl/config/configuration_no-asm.h +++ b/deps/openssl/config/configuration_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/configuration.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/configuration.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/configuration.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/configuration.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/crmf_asm.h b/deps/openssl/config/crmf_asm.h index d98627f9ed..f61b6f2639 100644 --- a/deps/openssl/config/crmf_asm.h +++ b/deps/openssl/config/crmf_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/crmf.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/crmf.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/crmf.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/crmf.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/crmf_no-asm.h b/deps/openssl/config/crmf_no-asm.h index 681a0719f4..57427c9f59 100644 --- a/deps/openssl/config/crmf_no-asm.h +++ b/deps/openssl/config/crmf_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/crmf.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/crmf.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/crmf.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/crmf.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/crypto_asm.h b/deps/openssl/config/crypto_asm.h index 337bd5f4ab..edddcd5d94 100644 --- a/deps/openssl/config/crypto_asm.h +++ b/deps/openssl/config/crypto_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/crypto.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/crypto.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/crypto.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/crypto.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/crypto_no-asm.h b/deps/openssl/config/crypto_no-asm.h index 72b2463a7b..f292405e49 100644 --- a/deps/openssl/config/crypto_no-asm.h +++ b/deps/openssl/config/crypto_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/crypto.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/crypto.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/crypto.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/crypto.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/ct_asm.h b/deps/openssl/config/ct_asm.h index a5c5f33f32..d02b0055d0 100644 --- a/deps/openssl/config/ct_asm.h +++ b/deps/openssl/config/ct_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/ct.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/ct.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/ct.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/ct.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/ct_no-asm.h b/deps/openssl/config/ct_no-asm.h index 7260a89525..134536b847 100644 --- a/deps/openssl/config/ct_no-asm.h +++ b/deps/openssl/config/ct_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/ct.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/ct.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/ct.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/ct.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/dso_conf_asm.h b/deps/openssl/config/dso_conf_asm.h index 1c28bc1a65..9eff903fe1 100644 --- a/deps/openssl/config/dso_conf_asm.h +++ b/deps/openssl/config/dso_conf_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/crypto/dso_conf.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/crypto/dso_conf.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/crypto/dso_conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/crypto/dso_conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/dso_conf_no-asm.h b/deps/openssl/config/dso_conf_no-asm.h index 60c20cfdd2..a2b6d187e3 100644 --- a/deps/openssl/config/dso_conf_no-asm.h +++ b/deps/openssl/config/dso_conf_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/crypto/dso_conf.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/crypto/dso_conf.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/crypto/dso_conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/crypto/dso_conf.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/err_asm.h b/deps/openssl/config/err_asm.h index f5fbff643d..99d12d3800 100644 --- a/deps/openssl/config/err_asm.h +++ b/deps/openssl/config/err_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/err.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/err.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/err.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/err.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/err_no-asm.h b/deps/openssl/config/err_no-asm.h index 8138911eb0..0855256272 100644 --- a/deps/openssl/config/err_no-asm.h +++ b/deps/openssl/config/err_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/err.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/err.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/err.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/err.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/ess_asm.h b/deps/openssl/config/ess_asm.h index 87716f58e3..3b234356de 100644 --- a/deps/openssl/config/ess_asm.h +++ b/deps/openssl/config/ess_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/ess.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/ess.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/ess.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/ess.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/ess_no-asm.h b/deps/openssl/config/ess_no-asm.h index a602e74f35..4c226c3fec 100644 --- a/deps/openssl/config/ess_no-asm.h +++ b/deps/openssl/config/ess_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/ess.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/ess.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/ess.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/ess.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/fipskey_asm.h b/deps/openssl/config/fipskey_asm.h index 09a60b9fd5..a364750a7a 100644 --- a/deps/openssl/config/fipskey_asm.h +++ b/deps/openssl/config/fipskey_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/fipskey.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/fipskey.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/fipskey.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/fipskey.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/fipskey_no-asm.h b/deps/openssl/config/fipskey_no-asm.h index 90abf594cc..e311afc37b 100644 --- a/deps/openssl/config/fipskey_no-asm.h +++ b/deps/openssl/config/fipskey_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/fipskey.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/fipskey.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/fipskey.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/fipskey.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/include_asm.h.tmpl b/deps/openssl/config/include_asm.h.tmpl index 65b571a7e7..38f3fc9495 100644 --- a/deps/openssl/config/include_asm.h.tmpl +++ b/deps/openssl/config/include_asm.h.tmpl @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/include_no-asm.h.tmpl b/deps/openssl/config/include_no-asm.h.tmpl index 85488f86c3..16542438e0 100644 --- a/deps/openssl/config/include_no-asm.h.tmpl +++ b/deps/openssl/config/include_no-asm.h.tmpl @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/lhash_asm.h b/deps/openssl/config/lhash_asm.h index 03f9196efc..adaf14668e 100644 --- a/deps/openssl/config/lhash_asm.h +++ b/deps/openssl/config/lhash_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/lhash.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/lhash.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/lhash.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/lhash.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/lhash_no-asm.h b/deps/openssl/config/lhash_no-asm.h index e77ddda792..677cd6611e 100644 --- a/deps/openssl/config/lhash_no-asm.h +++ b/deps/openssl/config/lhash_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/lhash.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/lhash.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/lhash.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/lhash.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/ocsp_asm.h b/deps/openssl/config/ocsp_asm.h index 1792d165b2..46fd66fc95 100644 --- a/deps/openssl/config/ocsp_asm.h +++ b/deps/openssl/config/ocsp_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/ocsp.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/ocsp.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/ocsp.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/ocsp.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/ocsp_no-asm.h b/deps/openssl/config/ocsp_no-asm.h index c58549acf6..77cffacbbb 100644 --- a/deps/openssl/config/ocsp_no-asm.h +++ b/deps/openssl/config/ocsp_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/ocsp.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/ocsp.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/ocsp.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/ocsp.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/opensslv_asm.h b/deps/openssl/config/opensslv_asm.h index 399352386d..2af1952f80 100644 --- a/deps/openssl/config/opensslv_asm.h +++ b/deps/openssl/config/opensslv_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/opensslv.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/opensslv.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/opensslv.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/opensslv.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/opensslv_no-asm.h b/deps/openssl/config/opensslv_no-asm.h index 3b8947a20d..a06cd164c4 100644 --- a/deps/openssl/config/opensslv_no-asm.h +++ b/deps/openssl/config/opensslv_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/opensslv.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/opensslv.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/opensslv.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/pkcs12_asm.h b/deps/openssl/config/pkcs12_asm.h index cdc424fc98..9772982b6f 100644 --- a/deps/openssl/config/pkcs12_asm.h +++ b/deps/openssl/config/pkcs12_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/pkcs12.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/pkcs12.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/pkcs12.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/pkcs12.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/pkcs12_no-asm.h b/deps/openssl/config/pkcs12_no-asm.h index de7267319a..384c337673 100644 --- a/deps/openssl/config/pkcs12_no-asm.h +++ b/deps/openssl/config/pkcs12_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/pkcs12.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/pkcs12.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/pkcs12.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/pkcs12.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/pkcs7_asm.h b/deps/openssl/config/pkcs7_asm.h index 691ae4f775..903e74dfc9 100644 --- a/deps/openssl/config/pkcs7_asm.h +++ b/deps/openssl/config/pkcs7_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/pkcs7.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/pkcs7.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/pkcs7.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/pkcs7.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/pkcs7_no-asm.h b/deps/openssl/config/pkcs7_no-asm.h index d86ceeecc9..c4c6ca1e08 100644 --- a/deps/openssl/config/pkcs7_no-asm.h +++ b/deps/openssl/config/pkcs7_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/pkcs7.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/pkcs7.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/pkcs7.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/pkcs7.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/safestack_asm.h b/deps/openssl/config/safestack_asm.h index 14567c7faa..8609a52a70 100644 --- a/deps/openssl/config/safestack_asm.h +++ b/deps/openssl/config/safestack_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/safestack.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/safestack.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/safestack.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/safestack.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/safestack_no-asm.h b/deps/openssl/config/safestack_no-asm.h index bd6e56db50..e4bb78a611 100644 --- a/deps/openssl/config/safestack_no-asm.h +++ b/deps/openssl/config/safestack_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/safestack.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/safestack.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/safestack.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/safestack.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/srp_asm.h b/deps/openssl/config/srp_asm.h index a4f7946e0a..a0e2cc35de 100644 --- a/deps/openssl/config/srp_asm.h +++ b/deps/openssl/config/srp_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/srp.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/srp.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/srp.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/srp.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/srp_no-asm.h b/deps/openssl/config/srp_no-asm.h index 0b7288041d..bf5f19f238 100644 --- a/deps/openssl/config/srp_no-asm.h +++ b/deps/openssl/config/srp_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/srp.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/srp.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/srp.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/srp.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/ssl_asm.h b/deps/openssl/config/ssl_asm.h index b634f4560c..f34f7021cc 100644 --- a/deps/openssl/config/ssl_asm.h +++ b/deps/openssl/config/ssl_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/ssl.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/ssl.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/ssl.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/ssl.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/ssl_no-asm.h b/deps/openssl/config/ssl_no-asm.h index c5919a5b20..88e4fb8b0d 100644 --- a/deps/openssl/config/ssl_no-asm.h +++ b/deps/openssl/config/ssl_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/ssl.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/ssl.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/ssl.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/ssl.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/ui_asm.h b/deps/openssl/config/ui_asm.h index 887b308871..80f26affa8 100644 --- a/deps/openssl/config/ui_asm.h +++ b/deps/openssl/config/ui_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/ui.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/ui.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/ui.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/ui.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/ui_no-asm.h b/deps/openssl/config/ui_no-asm.h index 8470484983..18ee1c2045 100644 --- a/deps/openssl/config/ui_no-asm.h +++ b/deps/openssl/config/ui_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/ui.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/ui.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/ui.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/ui.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/x509_asm.h b/deps/openssl/config/x509_asm.h index 45d6659c26..b0503da369 100644 --- a/deps/openssl/config/x509_asm.h +++ b/deps/openssl/config/x509_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/x509.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/x509.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/x509.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/x509.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/x509_no-asm.h b/deps/openssl/config/x509_no-asm.h index 5b8644d646..dc7dec4f73 100644 --- a/deps/openssl/config/x509_no-asm.h +++ b/deps/openssl/config/x509_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/x509.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/x509.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/x509.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/x509.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/x509_vfy_asm.h b/deps/openssl/config/x509_vfy_asm.h index 34214226f0..8f294d356a 100644 --- a/deps/openssl/config/x509_vfy_asm.h +++ b/deps/openssl/config/x509_vfy_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/x509_vfy.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/x509_vfy.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/x509_vfy.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/x509_vfy.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/x509_vfy_no-asm.h b/deps/openssl/config/x509_vfy_no-asm.h index 8ec020a7f4..190c255473 100644 --- a/deps/openssl/config/x509_vfy_no-asm.h +++ b/deps/openssl/config/x509_vfy_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/x509_vfy.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/x509_vfy.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/x509_vfy.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/x509_vfy.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/x509v3_asm.h b/deps/openssl/config/x509v3_asm.h index 936ab62d7b..bb2b28f6f3 100644 --- a/deps/openssl/config/x509v3_asm.h +++ b/deps/openssl/config/x509v3_asm.h @@ -39,8 +39,6 @@ # include "./archs/linux-ppc/asm/include/openssl/x509v3.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/asm/include/openssl/x509v3.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/asm/include/openssl/x509v3.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/asm/include/openssl/x509v3.h" #elif defined(OPENSSL_LINUX) && defined(__s390__) diff --git a/deps/openssl/config/x509v3_no-asm.h b/deps/openssl/config/x509v3_no-asm.h index 2941402eac..bb6cfa1590 100644 --- a/deps/openssl/config/x509v3_no-asm.h +++ b/deps/openssl/config/x509v3_no-asm.h @@ -41,8 +41,6 @@ # include "./archs/linux-ppc/no-asm/include/openssl/x509v3.h" #elif defined(_AIX) && defined(_ARCH_PPC64) # include "./archs/aix64-gcc-as/no-asm/include/openssl/x509v3.h" -#elif defined(_AIX) && !defined(_ARCH_PPC64) && defined(_ARCH_PPC) -# include "./archs/aix-gcc/no-asm/include/openssl/x509v3.h" #elif defined(OPENSSL_LINUX) && defined(__s390x__) # include "./archs/linux64-s390x/no-asm/include/openssl/x509v3.h" #elif defined(OPENSSL_LINUX) && defined(__s390__)