node-linux-s390x 17.9.1 → 18.2.0

package/include/node/openssl/ess_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/ess.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/ess_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/ess.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/fipskey_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/fipskey.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/fipskey_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/fipskey.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/lhash_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/lhash.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/lhash_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/lhash.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/ocsp_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/ocsp.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/ocsp_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/ocsp.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/opensslconf.h

@@ -1,23 +1,17 @@
-#undef OPENSSL_LINUX
-#if defined(__linux) && !defined(__ANDROID__)
-# define OPENSSL_LINUX 1
-#endif
+/*
+ * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
 
-#if defined(OPENSSL_NO_ASM)
-# include "./opensslconf_no-asm.h"
-#else
-# include "./opensslconf_asm.h"
-#endif
+#ifndef OPENSSL_OPENSSLCONF_H
+# define OPENSSL_OPENSSLCONF_H
+# pragma once
 
-/* GOST is not included in all platform */
-#ifndef OPENSSL_NO_GOST
-# define OPENSSL_NO_GOST
-#endif
-/* HW_PADLOCK is not included in all platform */
-#ifndef OPENSSL_NO_HW_PADLOCK
-# define OPENSSL_NO_HW_PADLOCK
-#endif
-/* musl in Alpine Linux does not support getcontext etc.*/
-#if defined(OPENSSL_LINUX) && !defined(__GLIBC__) && !defined(__clang__)
-# define OPENSSL_NO_ASYNC
-#endif
+# include <openssl/configuration.h>
+# include <openssl/macros.h>
+
+#endif  /* OPENSSL_OPENSSLCONF_H */

package/include/node/openssl/opensslv_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/opensslv_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/pkcs12_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/pkcs12.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/pkcs12_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/pkcs12.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/pkcs7_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/pkcs7.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/pkcs7_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/pkcs7.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/safestack_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/safestack.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/safestack_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/safestack.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/srp_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/srp.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/srp_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/srp.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/ssl_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/ssl_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/ui_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/ui.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/ui_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/ui.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/x509_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/x509.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/x509_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/x509.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/x509_vfy_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/x509_vfy.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/x509_vfy_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/x509_vfy.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/x509v3_asm.h

@@ -33,14 +33,8 @@
 # include "./archs/solaris64-x86_64-gcc/asm/include/openssl/x509v3.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/openssl/x509v3_no-asm.h

@@ -35,14 +35,8 @@
 # include "./archs/solaris64-x86_64-gcc/no-asm/include/openssl/x509v3.h"
 #elif defined(OPENSSL_LINUX) && defined(__PPC64__)  && defined(L_ENDIAN)
 # 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(_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__)

package/include/node/v8-array-buffer.h

@@ -175,8 +175,8 @@ class V8_EXPORT ArrayBuffer : public Object {
     /**
      * Convenience allocator.
      *
-     * When the virtual memory cage is enabled, this allocator will allocate its
-     * backing memory inside the cage. Otherwise, it will rely on malloc/free.
+     * When the sandbox is enabled, this allocator will allocate its backing
+     * memory inside the sandbox. Otherwise, it will rely on malloc/free.
      *
      * Caller takes ownership, i.e. the returned object needs to be freed using
      * |delete allocator| once it is no longer in use.

package/include/node/v8-callbacks.h

@@ -148,11 +148,13 @@ using JitCodeEventHandler = void (*)(const JitCodeEvent* event);
  */
 enum GCType {
   kGCTypeScavenge = 1 << 0,
-  kGCTypeMarkSweepCompact = 1 << 1,
-  kGCTypeIncrementalMarking = 1 << 2,
-  kGCTypeProcessWeakCallbacks = 1 << 3,
-  kGCTypeAll = kGCTypeScavenge | kGCTypeMarkSweepCompact |
-               kGCTypeIncrementalMarking | kGCTypeProcessWeakCallbacks
+  kGCTypeMinorMarkCompact = 1 << 1,
+  kGCTypeMarkSweepCompact = 1 << 2,
+  kGCTypeIncrementalMarking = 1 << 3,
+  kGCTypeProcessWeakCallbacks = 1 << 4,
+  kGCTypeAll = kGCTypeScavenge | kGCTypeMinorMarkCompact |
+               kGCTypeMarkSweepCompact | kGCTypeIncrementalMarking |
+               kGCTypeProcessWeakCallbacks
 };
 
 /**
@@ -316,7 +318,7 @@ using SharedArrayBufferConstructorEnabledCallback =
     bool (*)(Local<Context> context);
 
 /**
- * HostImportModuleDynamicallyWithImportAssertionsCallback is called when we
+ * HostImportModuleDynamicallyCallback is called when we
  * require the embedder to load a module. This is used as part of the dynamic
  * import syntax.
  *
@@ -346,6 +348,10 @@ using HostImportModuleDynamicallyWithImportAssertionsCallback =
                             Local<ScriptOrModule> referrer,
                             Local<String> specifier,
                             Local<FixedArray> import_assertions);
+using HostImportModuleDynamicallyCallback = MaybeLocal<Promise> (*)(
+    Local<Context> context, Local<Data> host_defined_options,
+    Local<Value> resource_name, Local<String> specifier,
+    Local<FixedArray> import_assertions);
 
 /**
  * HostInitializeImportMetaObjectCallback is called the first time import.meta
@@ -361,6 +367,20 @@ using HostInitializeImportMetaObjectCallback = void (*)(Local<Context> context,
                                                         Local<Module> module,
                                                         Local<Object> meta);
 
+/**
+ * HostCreateShadowRealmContextCallback is called each time a ShadowRealm is
+ * being constructed in the initiator_context.
+ *
+ * The method combines Context creation and implementation defined abstract
+ * operation HostInitializeShadowRealm into one.
+ *
+ * The embedder should use v8::Context::New or v8::Context:NewFromSnapshot to
+ * create a new context. If the creation fails, the embedder must propagate
+ * that exception by returning an empty MaybeLocal.
+ */
+using HostCreateShadowRealmContextCallback =
+    MaybeLocal<Context> (*)(Local<Context> initiator_context);
+
 /**
  * PrepareStackTraceCallback is called when the stack property of an error is
  * first accessed. The return value will be used as the stack value. If this

package/include/node/v8-context.h

@@ -313,17 +313,6 @@ class V8_EXPORT Context : public Data {
     explicit BackupIncumbentScope(Local<Context> backup_incumbent_context);
     ~BackupIncumbentScope();
 
-    /**
-     * Returns address that is comparable with JS stack address.  Note that JS
-     * stack may be allocated separately from the native stack.  See also
-     * |TryCatch::JSStackComparableAddressPrivate| for details.
-     */
-    V8_DEPRECATE_SOON(
-        "This is private V8 information that should not be exposed in the API.")
-    uintptr_t JSStackComparableAddress() const {
-      return JSStackComparableAddressPrivate();
-    }
-
    private:
     friend class internal::Isolate;
 
@@ -379,7 +368,7 @@ Local<Value> Context::GetEmbedderData(int index) {
 }
 
 void* Context::GetAlignedPointerFromEmbedderData(int index) {
-#ifndef V8_ENABLE_CHECKS
+#if !defined(V8_ENABLE_CHECKS)
   using A = internal::Address;
   using I = internal::Internals;
   A ctx = *reinterpret_cast<const A*>(this);
@@ -387,10 +376,10 @@ void* Context::GetAlignedPointerFromEmbedderData(int index) {
       I::ReadTaggedPointerField(ctx, I::kNativeContextEmbedderDataOffset);
   int value_offset =
       I::kEmbedderDataArrayHeaderSize + (I::kEmbedderDataSlotSize * index);
-#ifdef V8_HEAP_SANDBOX
+#ifdef V8_SANDBOXED_EXTERNAL_POINTERS
   value_offset += I::kEmbedderDataSlotRawPayloadOffset;
 #endif
-  internal::Isolate* isolate = I::GetIsolateForHeapSandbox(ctx);
+  internal::Isolate* isolate = I::GetIsolateForSandbox(ctx);
   return reinterpret_cast<void*>(
       I::ReadExternalPointerField(isolate, embedder_data, value_offset,
                                   internal::kEmbedderDataSlotPayloadTag));