Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorroland
Wed, 20 May 2015 17:06:44 +0200
changeset 30762 f169e79dc011
parent 30760 751b9e1fb0e5 (diff)
parent 30761 ce08cd63451f (current diff)
child 30763 8db0ca821362
child 31035 0f0743952c41
Merge
--- a/hotspot/test/test_env.sh	Wed May 20 10:21:02 2015 +0100
+++ b/hotspot/test/test_env.sh	Wed May 20 17:06:44 2015 +0200
@@ -198,6 +198,11 @@
 then
   VM_CPU="ia64"
 fi
+grep "aarch64" 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}"
jdk-sandbox