[aarch64-port-dev ] Rename hsdis-amd64.so

[Andrew Haley]

This corrects the name hsdis-amd64.so to hsdis-aarch64.so in JDK7 so that
people can have both.  OK?

Andrew.


diff -r 704d94f82eaf make/linux/makefiles/vm.make
--- a/make/linux/makefiles/vm.make      Mon Nov 10 05:16:14 2014 -0500
+++ b/make/linux/makefiles/vm.make      Tue Nov 11 10:10:59 2014 +0000
@@ -92,6 +92,10 @@
 BUILD_USER    = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
 VM_DISTRO     = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""

+ifeq ($(BUILTIN_SIM), true)
+  HS_LIB_ARCH=-DHOTSPOT_LIB_ARCH="\"aarch64\""
+endif
+
 CXXFLAGS =           \
   ${SYSDEFS}         \
   ${INCLUDES}        \
diff -r a38087edd2d8 buildhybrid.sh
--- a/buildhybrid.sh    Mon Nov 10 05:32:28 2014 -0500
+++ b/buildhybrid.sh    Tue Nov 11 10:09:25 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 \
-      -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
+if [ ! -f build/linux-aarch64-debug/j2sdk-image/jre/lib/aarch64/hsdis-aarch64.so -a \
+      -d  build/linux-aarch64-debug/j2sdk-image/jre/lib/aarch64 ] ; then
+  cp hotspot/src/share/tools/hsdis/build/linux-aarch64/hsdis-aarch64.so \
+     build/linux-aarch64-debug/j2sdk-image/jre/lib/aarch64/hsdis-aarch64.so
+  cp hotspot/src/share/tools/hsdis/build/linux-aarch64/hsdis-aarch64.so \
+     build/linux-aarch64-debug/j2sdk-server-image/jre/lib/aarch64/hsdis-aarch64.so
 fi