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

[Andrew Dinn]

On 11/11/14 10:11, Andrew Haley wrote:
> This corrects the name hsdis-amd64.so to hsdis-aarch64.so in JDK7 so that
> people can have both.  OK?

Don't think so. Your edits to buildhybrid.sh assume that the images will
be located under

  build/linux-aarch64-debug

and that each image dir will contain a subdir

  jre/lib/aarch64

That does not appear to be the case.

I applied your diffs, deleted my build directory and rebuilt

  [adinn at sputstik icedtea7-forest-aarch64]$ bash buildhybrid.sh
  . . .

Firstly, this still leaves the images under build/linux-amd64, not under
build/linux-aarch64

  [adinn at sputstik icedtea7-forest-aarch64]$ ls build
  linux-amd64  linux-amd64-debug

Secondly, the server directory still contains an amd64 subdir, not an
aarch64 subdir

  [adinn at sputstik icedtea7-forest-aarch64]$ ls
build/linux-amd64-debug/j2sdk-image/jre/lib/aarch64
  ls: cannot access build/linux-amd64-debug/j2sdk-image/jre/lib/aarch64:
  No such file or directory
  [adinn at sputstik icedtea7-forest-aarch64]$ ls
build/linux-amd64-debug/j2sdk-image/jre/lib/amd64
  headless	   libj2krb5.so		libjdwp.so	  libsctp.so
  . . .

As a consequence hsdis.so does not get copied into the build tree. The
resulting build still works but hsdis.so cannot be loaded (unless, of
course, you have a copy squirreled away somewhere which is referenced
from your LD_LIBRARY_PATH :-)

I believe the patch to buildhybrid.sh should be as follows:

diff -r a38087edd2d8 buildhybrid.sh
--- a/buildhybrid.sh	Mon Nov 10 05:32:28 2014 -0500
+++ b/buildhybrid.sh	Wed Nov 12 10:47:06 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

regards,


Andrew Dinn
-----------