Address review comment

Author: KostasTsiounis

closed/adds/jdk/src/share/native/jdk/crypto/jniprovider/NativeCrypto.c

@@ -643,21 +643,11 @@ find_crypto_library(jboolean traceEnabled, const char *chomepath)
 
     /* If JAVA_HOME is not null or empty and no library has been loaded yet, try there. */
     if ((NULL != chomepath) && ('\0' != *chomepath) && (NULL == crypto_library)) {
-#if defined(__APPLE__)
-        static const char pathSuffix[] = "/lib/";
-#elif defined(_WIN32) /* defined(__APPLE__) */
+#if defined(_WIN32)
         static const char pathSuffix[] = "\\bin\\";
-#elif defined(__aarch64__) /* defined(_WIN32) */
-        static const char pathSuffix[] = "/lib/aarch64/";
-#elif defined(__ppc64__) && defined(_AIX) /* defined(__aarch64__) */
-        static const char pathSuffix[] = "/lib/ppc64/";
-#elif defined(__PPC64__) && defined(__linux__) /* defined(__ppc64__) && defined(_AIX) */
-        static const char pathSuffix[] = "/lib/ppc64le/";
-#elif defined(__s390x__) /* defined(__PPC64__) && defined(__linux__) */
-        static const char pathSuffix[] = "/lib/s390x/";
-#else /* defined(__s390x__) */
-        static const char pathSuffix[] = "/lib/amd64/";
-#endif /* defined(__APPLE__) */
+#else /* defined(_WIN32) */
+        static const char pathSuffix[] = "/lib" OPENJDK_TARGET_CPU_LIBDIR "/";
+#endif /* defined(_WIN32) */
 
         size_t path_len = strlen(chomepath) + sizeof(pathSuffix) - 1;
         char *libPath = malloc(path_len + 1);

jdk/make/lib/SecurityLibraries.gmk

@@ -319,6 +319,7 @@ ifeq ($(WITH_OPENSSL), yes)
         LANG := C, \
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB) \
+            -DOPENJDK_TARGET_CPU_LIBDIR='"$(OPENJDK_TARGET_CPU_LIBDIR)"' \
             -I$(SRC_ROOT)/closed/adds/jdk/src/share/native/jdk/crypto/jniprovider \
             -c $(OPENSSL_CFLAGS), \
         MAPFILE := $(SRC_ROOT)/closed/make/mapfiles/libjncrypto/mapfile-vers, \