test/compiler/aot/scripts/build-bootmodules.sh

*** 34,44 ****
      rm -f $JAVA_HOME/lib/lib$m*.$SO_TYPE
  done
  
  $JAVA_HOME/bin/javac -d . $DIR/$TEST.java
  
! JAOTC_OPTS="-J-Xmx4g -J-ea --compile-for-tiered --info"
  JAVA_OPTS="-Xmx4g -XX:+UseAOT -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading"
  
  # Compile with: +UseCompressedOops +UseG1GC
  LIBRARIES=""
  for m in $MODULES; do
--- 34,44 ----
      rm -f $JAVA_HOME/lib/lib$m*.$SO_TYPE
  done
  
  $JAVA_HOME/bin/javac -d . $DIR/$TEST.java
  
! JAOTC_OPTS="-J-Xmx4g --compile-for-tiered --info"
  JAVA_OPTS="-Xmx4g -XX:+UseAOT -XX:+UnlockDiagnosticVMOptions -XX:+UseAOTStrictLoading"
  
  # Compile with: +UseCompressedOops +UseG1GC
  LIBRARIES=""
  for m in $MODULES; do