ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'openjdk-version' of https://github.com/xranby/avian

Browse Source
This commit is contained in:
Joel Dice 2012-09-05 12:38:42 -06:00
commit d3b32ecffd
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
makefile
View File

@ -194,6 +194,7 @@ target-cflags = -DTARGET_BYTES_PER_WORD=$(pointer-size)
common-cflags = $(warnings) -fno-rtti -fno-exceptions -I$(classpath-src) \
"-I$(JAVA_HOME)/include" -idirafter $(src) -I$(build) $(classpath-cflags) \
-D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_ -DAVIAN_VERSION=\"$(version)\" \
-DAVIAN_INFO="\"$(info)\"" \
-DUSE_ATOMIC_OPERATIONS -DAVIAN_JAVA_HOME=\"$(javahome)\" \
-DAVIAN_EMBED_PREFIX=\"$(embed-prefix)\" $(target-cflags)

6
src/classpath-openjdk.cpp
View File

@ -3006,6 +3006,12 @@ jvmInitProperties(Thread* t, uintptr_t* arguments)
"Avian Contributors");
local::setProperty(t, method, *properties, "java.vm.name","Avian");
#ifdef AVIAN_VERSION
local::setProperty(t, method, *properties, "java.vm.version",AVIAN_VERSION);
#endif
#ifdef AVIAN_INFO
local::setProperty(t, method, *properties, "java.vm.info",AVIAN_INFO);
#endif
local::setProperty
(t, method, *properties, "java.home",