diff --git a/deps/openssl/README.md b/deps/openssl/README.md index e995e70ba9aeb0..af32339903eb25 100644 --- a/deps/openssl/README.md +++ b/deps/openssl/README.md @@ -51,7 +51,6 @@ Here is a list of supported architectures for use of ASM in OpenSSL. | linux | x64 | linux-x86_64 | o | | linux | arm | linux-armv4 | o | | linux | arm64 | linux-aarch64 | o | - | linux | ppc | linux-ppc | o | | linux | ppc64 | linux-ppc64 | o | | linux | ppc64(*1) | linux-ppc64le | o | | linux | s390 | linux32-s390x | o | diff --git a/deps/openssl/config/Makefile b/deps/openssl/config/Makefile index 91aa1a37fada95..7b4a78feae0b50 100644 --- a/deps/openssl/config/Makefile +++ b/deps/openssl/config/Makefile @@ -11,7 +11,7 @@ PERL = perl # Supported architecture list 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-armv4 linux-elf linux-x86_64 \ linux-ppc64 linux-ppc64le linux32-s390x linux64-s390x linux64-mips64\ solaris-x86-gcc solaris64-x86_64-gcc VC-WIN64A VC-WIN32 diff --git a/deps/openssl/config/asn1_asm.h b/deps/openssl/config/asn1_asm.h index 20e385faaca585..f050b1bce31368 100644 --- a/deps/openssl/config/asn1_asm.h +++ b/deps/openssl/config/asn1_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/asn1.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/asn1.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/asn1_no-asm.h b/deps/openssl/config/asn1_no-asm.h index fbb70cf8e7a432..d4d2edb0c439f5 100644 --- a/deps/openssl/config/asn1_no-asm.h +++ b/deps/openssl/config/asn1_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/asn1.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/asn1.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/asn1t_asm.h b/deps/openssl/config/asn1t_asm.h index 8ce4eb056e9fd5..62c1c43cf4b6f1 100644 --- a/deps/openssl/config/asn1t_asm.h +++ b/deps/openssl/config/asn1t_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/asn1t.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/asn1t.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/asn1t_no-asm.h b/deps/openssl/config/asn1t_no-asm.h index 2e014020e8070e..5f6396bc52be6c 100644 --- a/deps/openssl/config/asn1t_no-asm.h +++ b/deps/openssl/config/asn1t_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/asn1t.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/asn1t.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/bio_asm.h b/deps/openssl/config/bio_asm.h index effd479c219c03..fe3f41bb08a97a 100644 --- a/deps/openssl/config/bio_asm.h +++ b/deps/openssl/config/bio_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/bio.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/bio.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/bio_no-asm.h b/deps/openssl/config/bio_no-asm.h index 0caedd9295a8ce..f4386fa135b482 100644 --- a/deps/openssl/config/bio_no-asm.h +++ b/deps/openssl/config/bio_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/bio.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/bio.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/bn_conf_asm.h b/deps/openssl/config/bn_conf_asm.h index 7c706e1d361f2d..80265a3f80c20e 100644 --- a/deps/openssl/config/bn_conf_asm.h +++ b/deps/openssl/config/bn_conf_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/crypto/bn_conf.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/crypto/bn_conf.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/bn_conf_no-asm.h b/deps/openssl/config/bn_conf_no-asm.h index 1e616a1eba7b71..ec0ae8a81399c2 100644 --- a/deps/openssl/config/bn_conf_no-asm.h +++ b/deps/openssl/config/bn_conf_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/crypto/bn_conf.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/crypto/bn_conf.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/cmp_asm.h b/deps/openssl/config/cmp_asm.h index 70802e8f69d51b..d36ecba96624db 100644 --- a/deps/openssl/config/cmp_asm.h +++ b/deps/openssl/config/cmp_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/cmp.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/cmp.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/cmp_no-asm.h b/deps/openssl/config/cmp_no-asm.h index 02054dcf064c8a..69838334c5addd 100644 --- a/deps/openssl/config/cmp_no-asm.h +++ b/deps/openssl/config/cmp_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/cmp.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/cmp.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/cms_asm.h b/deps/openssl/config/cms_asm.h index 67e790ef9bbaf6..d166fe2b3295ff 100644 --- a/deps/openssl/config/cms_asm.h +++ b/deps/openssl/config/cms_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/cms.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/cms.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/cms_no-asm.h b/deps/openssl/config/cms_no-asm.h index 6d59d8a6ddf91f..9743070b8a4d97 100644 --- a/deps/openssl/config/cms_no-asm.h +++ b/deps/openssl/config/cms_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/cms.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/cms.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/conf_asm.h b/deps/openssl/config/conf_asm.h index 9be2f0d0a9522a..1e9b888d6f7b22 100644 --- a/deps/openssl/config/conf_asm.h +++ b/deps/openssl/config/conf_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/conf.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/conf.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/conf_no-asm.h b/deps/openssl/config/conf_no-asm.h index d467b2ced0fba3..9c5806321caef2 100644 --- a/deps/openssl/config/conf_no-asm.h +++ b/deps/openssl/config/conf_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/conf.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/conf.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/configuration_asm.h b/deps/openssl/config/configuration_asm.h index 9bd73473a25910..2138e8b0f51aa8 100644 --- a/deps/openssl/config/configuration_asm.h +++ b/deps/openssl/config/configuration_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/configuration.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/configuration.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/configuration_no-asm.h b/deps/openssl/config/configuration_no-asm.h index 99f8afb51e48ef..bf5ec527b823ba 100644 --- a/deps/openssl/config/configuration_no-asm.h +++ b/deps/openssl/config/configuration_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/configuration.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/configuration.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/crmf_asm.h b/deps/openssl/config/crmf_asm.h index f61b6f2639388e..e16c5cac1ed2ac 100644 --- a/deps/openssl/config/crmf_asm.h +++ b/deps/openssl/config/crmf_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/crmf.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/crmf.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/crmf_no-asm.h b/deps/openssl/config/crmf_no-asm.h index 57427c9f597006..387d71905a7c90 100644 --- a/deps/openssl/config/crmf_no-asm.h +++ b/deps/openssl/config/crmf_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/crmf.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/crmf.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/crypto_asm.h b/deps/openssl/config/crypto_asm.h index edddcd5d94bac4..1ebe30cb415b1a 100644 --- a/deps/openssl/config/crypto_asm.h +++ b/deps/openssl/config/crypto_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/crypto.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/crypto.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/crypto_no-asm.h b/deps/openssl/config/crypto_no-asm.h index f292405e493ca8..83df3c22605a10 100644 --- a/deps/openssl/config/crypto_no-asm.h +++ b/deps/openssl/config/crypto_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/crypto.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/crypto.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/ct_asm.h b/deps/openssl/config/ct_asm.h index d02b0055d0b631..91aa510e058031 100644 --- a/deps/openssl/config/ct_asm.h +++ b/deps/openssl/config/ct_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/ct.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/ct.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/ct_no-asm.h b/deps/openssl/config/ct_no-asm.h index 134536b84721d2..21b45380d9fc8b 100644 --- a/deps/openssl/config/ct_no-asm.h +++ b/deps/openssl/config/ct_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/ct.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/ct.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/dso_conf_asm.h b/deps/openssl/config/dso_conf_asm.h index 9eff903fe105a1..ebd74da70d71ab 100644 --- a/deps/openssl/config/dso_conf_asm.h +++ b/deps/openssl/config/dso_conf_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/crypto/dso_conf.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/crypto/dso_conf.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/dso_conf_no-asm.h b/deps/openssl/config/dso_conf_no-asm.h index a2b6d187e3f850..3dc706948723a7 100644 --- a/deps/openssl/config/dso_conf_no-asm.h +++ b/deps/openssl/config/dso_conf_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/crypto/dso_conf.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/crypto/dso_conf.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/err_asm.h b/deps/openssl/config/err_asm.h index 99d12d38001486..272809478a49d0 100644 --- a/deps/openssl/config/err_asm.h +++ b/deps/openssl/config/err_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/err.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/err.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/err_no-asm.h b/deps/openssl/config/err_no-asm.h index 085525627218e2..176b7ed09a05fe 100644 --- a/deps/openssl/config/err_no-asm.h +++ b/deps/openssl/config/err_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/err.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/err.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/ess_asm.h b/deps/openssl/config/ess_asm.h index 3b234356de301a..f9023eaf4a975e 100644 --- a/deps/openssl/config/ess_asm.h +++ b/deps/openssl/config/ess_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/ess.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/ess.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/ess_no-asm.h b/deps/openssl/config/ess_no-asm.h index 4c226c3fec8164..2df9aeff109d7e 100644 --- a/deps/openssl/config/ess_no-asm.h +++ b/deps/openssl/config/ess_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/ess.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/ess.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/fipskey_asm.h b/deps/openssl/config/fipskey_asm.h index a364750a7a7931..e5f871a0024a0c 100644 --- a/deps/openssl/config/fipskey_asm.h +++ b/deps/openssl/config/fipskey_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/fipskey.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/fipskey.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/fipskey_no-asm.h b/deps/openssl/config/fipskey_no-asm.h index e311afc37ba27c..02be14cd9f223f 100644 --- a/deps/openssl/config/fipskey_no-asm.h +++ b/deps/openssl/config/fipskey_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/fipskey.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/fipskey.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/include_asm.h.tmpl b/deps/openssl/config/include_asm.h.tmpl index 38f3fc94959d08..150b19bfc144d8 100644 --- a/deps/openssl/config/include_asm.h.tmpl +++ b/deps/openssl/config/include_asm.h.tmpl @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/include_no-asm.h.tmpl b/deps/openssl/config/include_no-asm.h.tmpl index 16542438e07451..482e40ee94a3ff 100644 --- a/deps/openssl/config/include_no-asm.h.tmpl +++ b/deps/openssl/config/include_no-asm.h.tmpl @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/%%-$asmdir-%%/include/%%-$incdir-%%/%%-$name-%%.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/lhash_asm.h b/deps/openssl/config/lhash_asm.h index adaf14668e024d..1741665c57b4e3 100644 --- a/deps/openssl/config/lhash_asm.h +++ b/deps/openssl/config/lhash_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/lhash.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/lhash.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/lhash_no-asm.h b/deps/openssl/config/lhash_no-asm.h index 677cd6611e7275..06f467d8bc2458 100644 --- a/deps/openssl/config/lhash_no-asm.h +++ b/deps/openssl/config/lhash_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/lhash.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/lhash.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/ocsp_asm.h b/deps/openssl/config/ocsp_asm.h index 46fd66fc95c537..76ac3d1533de67 100644 --- a/deps/openssl/config/ocsp_asm.h +++ b/deps/openssl/config/ocsp_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/ocsp.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/ocsp.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/ocsp_no-asm.h b/deps/openssl/config/ocsp_no-asm.h index 77cffacbbbd664..47597c28fc7a82 100644 --- a/deps/openssl/config/ocsp_no-asm.h +++ b/deps/openssl/config/ocsp_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/ocsp.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/ocsp.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/opensslv_asm.h b/deps/openssl/config/opensslv_asm.h index 2af1952f805bc8..4ef44b615981ba 100644 --- a/deps/openssl/config/opensslv_asm.h +++ b/deps/openssl/config/opensslv_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/opensslv.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/opensslv.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/opensslv_no-asm.h b/deps/openssl/config/opensslv_no-asm.h index a06cd164c46ebf..35f977a0dd8054 100644 --- a/deps/openssl/config/opensslv_no-asm.h +++ b/deps/openssl/config/opensslv_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/opensslv.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/opensslv.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/pkcs12_asm.h b/deps/openssl/config/pkcs12_asm.h index 9772982b6f8e3d..378aabd5a06166 100644 --- a/deps/openssl/config/pkcs12_asm.h +++ b/deps/openssl/config/pkcs12_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/pkcs12.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/pkcs12.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/pkcs12_no-asm.h b/deps/openssl/config/pkcs12_no-asm.h index 384c3376736422..b68245074d7588 100644 --- a/deps/openssl/config/pkcs12_no-asm.h +++ b/deps/openssl/config/pkcs12_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/pkcs12.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/pkcs12.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/pkcs7_asm.h b/deps/openssl/config/pkcs7_asm.h index 903e74dfc93cc8..22778c147a2bb6 100644 --- a/deps/openssl/config/pkcs7_asm.h +++ b/deps/openssl/config/pkcs7_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/pkcs7.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/pkcs7.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/pkcs7_no-asm.h b/deps/openssl/config/pkcs7_no-asm.h index c4c6ca1e085993..dc2c94e72c7cbf 100644 --- a/deps/openssl/config/pkcs7_no-asm.h +++ b/deps/openssl/config/pkcs7_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/pkcs7.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/pkcs7.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/safestack_asm.h b/deps/openssl/config/safestack_asm.h index 8609a52a70ba1d..1c28b92c224a54 100644 --- a/deps/openssl/config/safestack_asm.h +++ b/deps/openssl/config/safestack_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/safestack.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/safestack.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/safestack_no-asm.h b/deps/openssl/config/safestack_no-asm.h index e4bb78a6119750..71ee78809c5e0b 100644 --- a/deps/openssl/config/safestack_no-asm.h +++ b/deps/openssl/config/safestack_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/safestack.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/safestack.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/srp_asm.h b/deps/openssl/config/srp_asm.h index a0e2cc35defb2b..91f46115c49953 100644 --- a/deps/openssl/config/srp_asm.h +++ b/deps/openssl/config/srp_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/srp.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/srp.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/srp_no-asm.h b/deps/openssl/config/srp_no-asm.h index bf5f19f238033d..5faa1d6916ed73 100644 --- a/deps/openssl/config/srp_no-asm.h +++ b/deps/openssl/config/srp_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/srp.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/srp.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/ssl_asm.h b/deps/openssl/config/ssl_asm.h index f34f7021cc11c7..95325ae60274dd 100644 --- a/deps/openssl/config/ssl_asm.h +++ b/deps/openssl/config/ssl_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/ssl.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/ssl.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/ssl_no-asm.h b/deps/openssl/config/ssl_no-asm.h index 88e4fb8b0ddca9..f482d5652371f0 100644 --- a/deps/openssl/config/ssl_no-asm.h +++ b/deps/openssl/config/ssl_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/ssl.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/ssl.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/ui_asm.h b/deps/openssl/config/ui_asm.h index 80f26affa8aa63..1216aeaa453d72 100644 --- a/deps/openssl/config/ui_asm.h +++ b/deps/openssl/config/ui_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/ui.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/ui.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/ui_no-asm.h b/deps/openssl/config/ui_no-asm.h index 18ee1c2045c68c..2331fb1eaa5fa3 100644 --- a/deps/openssl/config/ui_no-asm.h +++ b/deps/openssl/config/ui_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/ui.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/ui.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/x509_asm.h b/deps/openssl/config/x509_asm.h index b0503da36921b6..7aa572908739b5 100644 --- a/deps/openssl/config/x509_asm.h +++ b/deps/openssl/config/x509_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/x509.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/x509.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/x509_no-asm.h b/deps/openssl/config/x509_no-asm.h index dc7dec4f73f20e..f702747c106493 100644 --- a/deps/openssl/config/x509_no-asm.h +++ b/deps/openssl/config/x509_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/x509.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/x509.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/x509_vfy_asm.h b/deps/openssl/config/x509_vfy_asm.h index 8f294d356a9f8f..5c6e03bb374bed 100644 --- a/deps/openssl/config/x509_vfy_asm.h +++ b/deps/openssl/config/x509_vfy_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/x509_vfy.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/x509_vfy.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/x509_vfy_no-asm.h b/deps/openssl/config/x509_vfy_no-asm.h index 190c2554731530..b04dd7438a1c96 100644 --- a/deps/openssl/config/x509_vfy_no-asm.h +++ b/deps/openssl/config/x509_vfy_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/x509_vfy.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/x509_vfy.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/x509v3_asm.h b/deps/openssl/config/x509v3_asm.h index bb2b28f6f38711..476960be590f05 100644 --- a/deps/openssl/config/x509v3_asm.h +++ b/deps/openssl/config/x509v3_asm.h @@ -35,8 +35,6 @@ # include "./archs/linux-ppc64le/asm/include/openssl/x509v3.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/asm/include/openssl/x509v3.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__) diff --git a/deps/openssl/config/x509v3_no-asm.h b/deps/openssl/config/x509v3_no-asm.h index bb6cfa159081a9..ee48e432ff1db2 100644 --- a/deps/openssl/config/x509v3_no-asm.h +++ b/deps/openssl/config/x509v3_no-asm.h @@ -37,8 +37,6 @@ # include "./archs/linux-ppc64le/no-asm/include/openssl/x509v3.h" #elif defined(OPENSSL_LINUX) && defined(__PPC64__) # include "./archs/linux-ppc64/no-asm/include/openssl/x509v3.h" -#elif defined(OPENSSL_LINUX) && !defined(__PPC64__) && defined(__ppc__) -# 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(OPENSSL_LINUX) && defined(__s390x__)