stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8177390: java -version does not differentiate between which port of AArch64 is used

Browse Source 
Reviewed-by: aph, dholmes
This commit is contained in:
Mario Torre 2017-03-29 15:44:34 +00:00
parent aa49aa7eab
commit bb85a687d4
2 changed files with 11 additions and 0 deletions
hotspot
make/lib
CompileJvm.gmk
test
test_env.sh

6
hotspot/make/lib/CompileJvm.gmk

@ -118,6 +118,12 @@ ifeq ($(OPENJDK_TARGET_CPU), x86_64)
OPENJDK_TARGET_CPU_VM_VERSION := amd64
else ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
OPENJDK_TARGET_CPU_VM_VERSION := sparc
else ifeq ($(HOTSPOT_TARGET_CPU_ARCH), arm)
ifeq ($(OPENJDK_TARGET_CPU), aarch64)
# This sets the Oracle Aarch64 port to use arm64
# while the original Aarch64 port uses aarch64
OPENJDK_TARGET_CPU_VM_VERSION := arm64
endif
else
OPENJDK_TARGET_CPU_VM_VERSION := $(OPENJDK_TARGET_CPU)
endif

5
hotspot/test/test_env.sh

@ -214,6 +214,11 @@ if [ $? = 0 ]
then
VM_CPU="aarch64"
fi
grep "arm64" vm_version.out > ${NULL}
if [ $? = 0 ]
then
VM_CPU="aarch64"
fi
export VM_TYPE VM_BITS VM_OS VM_CPU
echo "VM_TYPE=${VM_TYPE}"
echo "VM_BITS=${VM_BITS}"