make/GenerateLinkOptData.gmk

*** 59,75 ****
  
  $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR)
          $(call MakeDir, $(LINK_OPT_DIR))
          $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
          $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
!         $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.tmp \
              -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
              -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
              build.tools.classlist.HelloClasslist \
              $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE)
!         $(GREP) -v HelloClasslist $@.tmp > $@
!         $(RM) -r $@.tmp
  
  # The jli trace is created by the same recipe as classlist. By declaring these
  # dependencies, make will correctly rebuild both jli trace and classlist
  # incrementally using the single recipe above.
  $(CLASSLIST_FILE): $(JLI_TRACE_FILE)
--- 59,74 ----
  
  $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXE_SUFFIX) $(CLASSLIST_JAR)
          $(call MakeDir, $(LINK_OPT_DIR))
          $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $@))
          $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE)))
!         $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \
              -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \
              -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
              build.tools.classlist.HelloClasslist \
              $(LOG_DEBUG) 2>&1 > $(JLI_TRACE_FILE)
!         $(GREP) -v HelloClasslist $@.raw > $@
  
  # The jli trace is created by the same recipe as classlist. By declaring these
  # dependencies, make will correctly rebuild both jli trace and classlist
  # incrementally using the single recipe above.
  $(CLASSLIST_FILE): $(JLI_TRACE_FILE)