src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Main.java

*** 164,174 ****
              try (Timer t = new Timer(this, "")) {
                  classesToCompile = collector.collectClassesToCompile();
                  printer.printInfo(classesToCompile.size() + " classes found");
              }
  
!             OptionValues graalOptions = HotSpotGraalOptionValues.HOTSPOT_OPTIONS;
              // Setting -Dgraal.TieredAOT overrides --compile-for-tiered
              if (!TieredAOT.hasBeenSet(graalOptions)) {
                  graalOptions = new OptionValues(graalOptions, TieredAOT, options.tiered);
              }
              graalOptions = new OptionValues(graalOptions, GeneratePIC, true, ImmutableCode, true);
--- 164,174 ----
              try (Timer t = new Timer(this, "")) {
                  classesToCompile = collector.collectClassesToCompile();
                  printer.printInfo(classesToCompile.size() + " classes found");
              }
  
!             OptionValues graalOptions = HotSpotGraalOptionValues.defaultOptions();
              // Setting -Dgraal.TieredAOT overrides --compile-for-tiered
              if (!TieredAOT.hasBeenSet(graalOptions)) {
                  graalOptions = new OptionValues(graalOptions, TieredAOT, options.tiered);
              }
              graalOptions = new OptionValues(graalOptions, GeneratePIC, true, ImmutableCode, true);