Mercurial > hg > truffle
changeset 10232:7243490a6847
Merge
author | coleenp |
---|---|
date | Tue, 07 May 2013 14:30:11 -0700 |
parents | 33bcd9ead1d5 (current diff) 58bb870a0cbd (diff) |
children | d3c98423c146 923ac8d1df95 28ae1d38d296 711016f146fd |
files | |
diffstat | 3 files changed, 20 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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