Mercurial > hg > graal-compiler
changeset 8793:499ccc15bbc8
8005716: Enhance JNI specification to allow support of static JNI libraries in Embedded JREs
Reviewed-by: dlong, alanb, mduigou
author | bpittore |
---|---|
date | Fri, 15 Mar 2013 15:20:40 -0400 |
parents | 69ffa4ac9e53 |
children | 9e62e72c59cc |
files | src/share/vm/prims/jni.cpp src/share/vm/prims/jni.h src/share/vm/runtime/thread.cpp |
diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/prims/jni.cpp Tue Mar 12 00:02:16 2013 -0400 +++ b/src/share/vm/prims/jni.cpp Fri Mar 15 15:20:40 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 Red Hat, Inc. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -92,7 +92,7 @@ # include "os_bsd.inline.hpp" #endif -static jint CurrentVersion = JNI_VERSION_1_6; +static jint CurrentVersion = JNI_VERSION_1_8; // The DT_RETURN_MARK macros create a scoped object to fire the dtrace
--- a/src/share/vm/prims/jni.h Tue Mar 12 00:02:16 2013 -0400 +++ b/src/share/vm/prims/jni.h Fri Mar 15 15:20:40 2013 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1951,6 +1951,7 @@ #define JNI_VERSION_1_2 0x00010002 #define JNI_VERSION_1_4 0x00010004 #define JNI_VERSION_1_6 0x00010006 +#define JNI_VERSION_1_8 0x00010008 #ifdef __cplusplus } /* extern "C" */
--- a/src/share/vm/runtime/thread.cpp Tue Mar 12 00:02:16 2013 -0400 +++ b/src/share/vm/runtime/thread.cpp Fri Mar 15 15:20:40 2013 -0400 @@ -4061,6 +4061,7 @@ if (version == JNI_VERSION_1_2) return JNI_TRUE; if (version == JNI_VERSION_1_4) return JNI_TRUE; if (version == JNI_VERSION_1_6) return JNI_TRUE; + if (version == JNI_VERSION_1_8) return JNI_TRUE; return JNI_FALSE; }