--- a/src/java.base/unix/native/include/jni_md.h	Mon Oct 30 16:37:53 2017 +0100
+++ b/src/java.base/unix/native/include/jni_md.h	Tue Oct 31 11:55:09 2017 -0400
@@ -30,8 +30,13 @@
   #define __has_attribute(x) 0
 #endif
 #if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility)
-  #define JNIEXPORT     __attribute__((visibility("default")))
-  #define JNIIMPORT     __attribute__((visibility("default")))
+  #ifdef ARM
+    #define JNIEXPORT     __attribute__((externally_visible,visibility("default")))
+    #define JNIIMPORT     __attribute__((externally_visible,visibility("default")))
+  #else
+    #define JNIEXPORT     __attribute__((visibility("default")))
+    #define JNIIMPORT     __attribute__((visibility("default")))
+  #endif
 #else
   #define JNIEXPORT
   #define JNIIMPORT
@@ -40,7 +45,7 @@
 #define JNICALL
 
 typedef int jint;
-#ifdef _LP64 /* 64-bit Solaris */
+#ifdef _LP64
 typedef long jlong;
 #else
 typedef long long jlong;