# HG changeset patch
# User coleenp
# Date 1367962211 25200
# Node ID 7243490a684726330004cacb1e76dbd269327411
# Parent  33bcd9ead1d519c826c594d4b36462948c7dc7de# Parent  58bb870a0cbd4cf6bd3b22d64c8cd74a956ea5a9
Merge

diff -r 33bcd9ead1d5 -r 7243490a6847 src/cpu/sparc/vm/jni_sparc.h
--- a/src/cpu/sparc/vm/jni_sparc.h	Tue May 07 21:36:59 2013 +0200
+++ b/src/cpu/sparc/vm/jni_sparc.h	Tue May 07 14:30:11 2013 -0700
@@ -23,7 +23,12 @@
  * questions.
  */
 
-#if defined(__GNUC__) && (__GNUC__ >= 4)
+// Note: please do not change these without also changing jni_md.h in the JDK
+// repository
+#ifndef __has_attribute
+  #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")))
 #else
diff -r 33bcd9ead1d5 -r 7243490a6847 src/cpu/x86/vm/jni_x86.h
--- a/src/cpu/x86/vm/jni_x86.h	Tue May 07 21:36:59 2013 +0200
+++ b/src/cpu/x86/vm/jni_x86.h	Tue May 07 14:30:11 2013 -0700
@@ -28,7 +28,13 @@
 
 #if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE)
 
-#if defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2)
+
+// Note: please do not change these without also changing jni_md.h in the JDK
+// repository
+#ifndef __has_attribute
+  #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")))
 #else
diff -r 33bcd9ead1d5 -r 7243490a6847 src/cpu/zero/vm/jni_zero.h
--- a/src/cpu/zero/vm/jni_zero.h	Tue May 07 21:36:59 2013 +0200
+++ b/src/cpu/zero/vm/jni_zero.h	Tue May 07 14:30:11 2013 -0700
@@ -25,7 +25,13 @@
  */
 
 
-#if defined(__GNUC__) && (__GNUC__ >= 4)
+
+// Note: please do not change these without also changing jni_md.h in the JDK
+// repository
+#ifndef __has_attribute
+  #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")))
 #else