changeset 1002:406f6e5f3bad

disassembler library should be built as hsdis-aarch64.so n.b. for this to chane to work you also need to pick up the corresponding change to vm.make in the hotspot make tree.
author adinn
date Fri, 14 Nov 2014 11:36:58 +0000
parents a38087edd2d8
children 9ff35eccd9ab
files buildhybrid.sh
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/buildhybrid.sh	Mon Nov 10 05:32:28 2014 -0500
+++ b/buildhybrid.sh	Fri Nov 14 11:36:58 2014 +0000
@@ -19,8 +19,9 @@
 
 # ensure the hsdis lib has been built
 
-if [ ! -f hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-amd64.so ] ; then
+if [ ! -f hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-aarch64.so ] ; then
   (export BINUTILS=`cd .. ; pwd`/binutils ; cd hotspot/src/share/tools/hsdis ; make BUILD_AARCH64=true)
+  mv hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-amd64.so hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-aarch64.so
 fi
 
 unset JAVA_HOME
@@ -50,10 +51,10 @@
 HOTSPOT_BUILD_JOBS=8 debug_build $*
 
 # ensure hsdis lib is installed
-if [ ! -f build/linux-amd64-debug/j2sdk-image/jre/lib/amd64/hsdis-amd64.so -a \
+if [ ! -f build/linux-amd64-debug/j2sdk-image/jre/lib/amd64/hsdis-aarch64.so -a \
       -d  build/linux-amd64-debug/j2sdk-image/jre/lib/amd64 ] ; then
-  cp hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-amd64.so \
-     build/linux-amd64-debug/j2sdk-image/jre/lib/amd64/hsdis-amd64.so
-  cp hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-amd64.so \
-     build/linux-amd64-debug/j2sdk-server-image/jre/lib/amd64/hsdis-amd64.so
+  cp hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-aarch64.so \
+     build/linux-amd64-debug/j2sdk-image/jre/lib/amd64/hsdis-aarch64.so
+  cp hotspot/src/share/tools/hsdis/build/linux-amd64/hsdis-aarch64.so \
+     build/linux-amd64-debug/j2sdk-server-image/jre/lib/amd64/hsdis-aarch64.so
 fi