Merge

Tue, 07 May 2013 14:30:11 -0700

author
coleenp
date
Tue, 07 May 2013 14:30:11 -0700
changeset 5064
7243490a6847
parent 5062
33bcd9ead1d5
parent 5063
58bb870a0cbd
child 5069
d3c98423c146
child 5077
923ac8d1df95
child 5087
28ae1d38d296
child 5092
711016f146fd

Merge

     1.1 --- a/src/cpu/sparc/vm/jni_sparc.h	Tue May 07 21:36:59 2013 +0200
     1.2 +++ b/src/cpu/sparc/vm/jni_sparc.h	Tue May 07 14:30:11 2013 -0700
     1.3 @@ -23,7 +23,12 @@
     1.4   * questions.
     1.5   */
     1.6  
     1.7 -#if defined(__GNUC__) && (__GNUC__ >= 4)
     1.8 +// Note: please do not change these without also changing jni_md.h in the JDK
     1.9 +// repository
    1.10 +#ifndef __has_attribute
    1.11 +  #define __has_attribute(x) 0
    1.12 +#endif
    1.13 +#if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility)
    1.14    #define JNIEXPORT     __attribute__((visibility("default")))
    1.15    #define JNIIMPORT     __attribute__((visibility("default")))
    1.16  #else
     2.1 --- a/src/cpu/x86/vm/jni_x86.h	Tue May 07 21:36:59 2013 +0200
     2.2 +++ b/src/cpu/x86/vm/jni_x86.h	Tue May 07 14:30:11 2013 -0700
     2.3 @@ -28,7 +28,13 @@
     2.4  
     2.5  #if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE)
     2.6  
     2.7 -#if defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2)
     2.8 +
     2.9 +// Note: please do not change these without also changing jni_md.h in the JDK
    2.10 +// repository
    2.11 +#ifndef __has_attribute
    2.12 +  #define __has_attribute(x) 0
    2.13 +#endif
    2.14 +#if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility)
    2.15    #define JNIEXPORT     __attribute__((visibility("default")))
    2.16    #define JNIIMPORT     __attribute__((visibility("default")))
    2.17  #else
     3.1 --- a/src/cpu/zero/vm/jni_zero.h	Tue May 07 21:36:59 2013 +0200
     3.2 +++ b/src/cpu/zero/vm/jni_zero.h	Tue May 07 14:30:11 2013 -0700
     3.3 @@ -25,7 +25,13 @@
     3.4   */
     3.5  
     3.6  
     3.7 -#if defined(__GNUC__) && (__GNUC__ >= 4)
     3.8 +
     3.9 +// Note: please do not change these without also changing jni_md.h in the JDK
    3.10 +// repository
    3.11 +#ifndef __has_attribute
    3.12 +  #define __has_attribute(x) 0
    3.13 +#endif
    3.14 +#if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility)
    3.15    #define JNIEXPORT     __attribute__((visibility("default")))
    3.16    #define JNIIMPORT     __attribute__((visibility("default")))
    3.17  #else

mercurial