common/bin/compare.sh

*** 652,665 ****
          if [ "$NAME" = "java.exe" ] \
                 && [ -f "$OTHER/support/native/java.base/java_objs/java.diz" ]; then
              OTHER_DIZ_FILE="$OTHER/support/native/java.base/java_objs/java.diz"
          elif [ "$NAME" = "jimage.exe" ] \
                 && [ -f "$OTHER/support/native/jdk.jlink/jimage_objs/jimage.diz" ]; then
!             OTHER_DIZ_FILE="$OTHER/support/native/jdk.jlink/jimage_objs/jimage.diz"
          elif [ "$NAME" = "javacpl.exe" ] \
                 && [ -f "$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then
!             OTHER_DIZ_FILE="$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz"
          elif [ -f "${OTHER_FILE_BASE}.diz" ]; then
              OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz
          else
              # Some files, jli.dll, appears twice in the image but only one of
              # them has a diz file next to it.
--- 652,665 ----
          if [ "$NAME" = "java.exe" ] \
                 && [ -f "$OTHER/support/native/java.base/java_objs/java.diz" ]; then
              OTHER_DIZ_FILE="$OTHER/support/native/java.base/java_objs/java.diz"
          elif [ "$NAME" = "jimage.exe" ] \
                 && [ -f "$OTHER/support/native/jdk.jlink/jimage_objs/jimage.diz" ]; then
!             OTHER_DIZ_FILE="$OTHER/support/modules_cmds/jdk.jlink/jimage.diz"
          elif [ "$NAME" = "javacpl.exe" ] \
                 && [ -f "$OTHER/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then
!             OTHER_DIZ_FILE="$OTHER/support/modules_cmds/jdk.deploy.controlpanel/javacpl.diz"
          elif [ -f "${OTHER_FILE_BASE}.diz" ]; then
              OTHER_DIZ_FILE=${OTHER_FILE_BASE}.diz
          else
              # Some files, jli.dll, appears twice in the image but only one of
              # them has a diz file next to it.
*** 684,697 ****
          if [ "$NAME" = "java.exe" ] \
                 && [ -f "$THIS/support/native/java.base/java_objs/java.diz" ]; then
              THIS_DIZ_FILE="$THIS/support/native/java.base/java_objs/java.diz"
          elif [ "$NAME" = "jimage.exe" ] \
                 && [ -f "$THIS/support/native/jdk.jlink/jimage_objs/jimage.diz" ]; then
!             THIS_DIZ_FILE="$THIS/support/native/jdk.jlink/jimage_objs/jimage.diz"
          elif [ "$NAME" = "javacpl.exe" ] \
                 && [ -f "$THIS/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then
!             THIS_DIZ_FILE="$THIS/support/native/jdk.plugin/javacpl/javacpl.diz"
          elif [ -f "${THIS_FILE_BASE}.diz" ]; then
              THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz
          else
              THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)"
              if [ ! -f "$THIS_DIZ_FILE" ]; then
--- 684,697 ----
          if [ "$NAME" = "java.exe" ] \
                 && [ -f "$THIS/support/native/java.base/java_objs/java.diz" ]; then
              THIS_DIZ_FILE="$THIS/support/native/java.base/java_objs/java.diz"
          elif [ "$NAME" = "jimage.exe" ] \
                 && [ -f "$THIS/support/native/jdk.jlink/jimage_objs/jimage.diz" ]; then
!             THIS_DIZ_FILE="$THIS/support/modules_cmds/jdk.jlink/jimage.diz"
          elif [ "$NAME" = "javacpl.exe" ] \
                 && [ -f "$THIS/support/native/jdk.plugin/javacpl/javacpl.diz" ]; then
!             THIS_DIZ_FILE="$THIS/support/modules_cmds/jdk.deploy.controlpanel/javacpl.diz"
          elif [ -f "${THIS_FILE_BASE}.diz" ]; then
              THIS_DIZ_FILE=${THIS_FILE/.dll/}.diz
          else
              THIS_DIZ_FILE="$($FIND $THIS_DIR -name $DIZ_NAME | $SED 1q)"
              if [ ! -f "$THIS_DIZ_FILE" ]; then