From 56e500ccf005e6dea65315b21ba411883abf054e Mon Sep 17 00:00:00 2001
From: emc <none@none>
Date: Tue, 7 May 2013 13:45:59 -0400
Subject: 8009729: Refix hotspot jni_<cpu>.h JNIEXPORT and JNIIMPORT
 definitions to match jdk version Summary: Update JNIEXPORT and JNIIMPORT to
 work with other compilers that don't necessarily have the __attribute__ type
 qualifier Reviewed-by: dholmes, dcubed, coleenp

---
 src/cpu/zero/vm/jni_zero.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/cpu/zero/vm/jni_zero.h')

diff --git a/src/cpu/zero/vm/jni_zero.h b/src/cpu/zero/vm/jni_zero.h
index 6ac4f63ea..11157f4f0 100644
--- a/src/cpu/zero/vm/jni_zero.h
+++ b/src/cpu/zero/vm/jni_zero.h
@@ -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
-- 
cgit v1.2.3