From 8dc71f22661bbecfd5af2959690b4be593285dc6 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 d2d1d26c182015..e995e70ba9aeb0 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 704ca17d9fdef5..91aa1a37fada95 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 b60bb86cc9a8d6..20e385faaca585 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 7e520876f1c984..fbb70cf8e7a432 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 0d3e3bdc8f783e..8ce4eb056e9fd5 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 d471b656a6166f..2e014020e8070e 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 19b4764b1b3090..effd479c219c03 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 7df408acc36585..0caedd9295a8ce 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 85ecbacf3aa47e..7c706e1d361f2d 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 06ab3d268cf748..1e616a1eba7b71 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 e78ec14eb9306c..70802e8f69d51b 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 2dd84b8deb02e3..02054dcf064c8a 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 8a23ad50090742..67e790ef9bbaf6 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 2507391663cfc5..6d59d8a6ddf91f 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 1e85a17fd48cf6..9be2f0d0a9522a 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 483d49164b811d..d467b2ced0fba3 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 dcc0a495a0a0c6..9bd73473a25910 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 0dc73e9e17f8d6..99f8afb51e48ef 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 d98627f9ed98bd..f61b6f2639388e 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 681a0719f42e73..57427c9f597006 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 337bd5f4ab06b0..edddcd5d94bac4 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 72b2463a7bcfb2..f292405e493ca8 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 a5c5f33f3262e1..d02b0055d0b631 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 7260a895255013..134536b84721d2 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 1c28bc1a65e8dd..9eff903fe105a1 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 60c20cfdd2c5d7..a2b6d187e3f850 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 f5fbff643da51e..99d12d38001486 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 8138911eb07250..085525627218e2 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 87716f58e32f66..3b234356de301a 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 a602e74f35fe8d..4c226c3fec8164 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 09a60b9fd5c544..a364750a7a7931 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 90abf594ccbe94..e311afc37ba27c 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 65b571a7e75a78..38f3fc94959d08 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 85488f86c3f92d..16542438e07451 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 03f9196efc3c9f..adaf14668e024d 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 e77ddda7921b0a..677cd6611e7275 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 1792d165b2493f..46fd66fc95c537 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 c58549acf6c221..77cffacbbbd664 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 399352386df28e..2af1952f805bc8 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 3b8947a20da7a1..a06cd164c46ebf 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 cdc424fc9892ca..9772982b6f8e3d 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 de7267319aadcd..384c3376736422 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 691ae4f775303c..903e74dfc93cc8 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 d86ceeecc93326..c4c6ca1e085993 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 14567c7faaf5f9..8609a52a70ba1d 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 bd6e56db5089ac..e4bb78a6119750 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 a4f7946e0a2707..a0e2cc35defb2b 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 0b7288041d55f0..bf5f19f238033d 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 b634f4560cb77a..f34f7021cc11c7 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 c5919a5b202b74..88e4fb8b0ddca9 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 887b308871cc47..80f26affa8aa63 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 8470484983fd30..18ee1c2045c68c 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 45d6659c2663e1..b0503da36921b6 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 5b8644d64666d6..dc7dec4f73f20e 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 34214226f0416e..8f294d356a9f8f 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 8ec020a7f4b99b..190c2554731530 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 936ab62d7b75e4..bb2b28f6f38711 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 2941402eac4bd0..bb6cfa159081a9 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__)