From 3b20bed6e2599fbddb16b75c06ee55637dd6836f Mon Sep 17 00:00:00 2001 From: Calvin Cheung Date: Fri, 9 May 2025 18:22:45 +0000 Subject: [PATCH] 8356229: cmp-baseline build fail due to lib/modules difference Reviewed-by: iklam, erikj, liach --- make/GenerateLinkOptData.gmk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/make/GenerateLinkOptData.gmk b/make/GenerateLinkOptData.gmk index 5fc745ba223..1f52b88e1ef 100644 --- a/make/GenerateLinkOptData.gmk +++ b/make/GenerateLinkOptData.gmk @@ -76,10 +76,12 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST $(call LogInfo, Generating $(patsubst $(OUTPUTDIR)/%, %, $(JLI_TRACE_FILE))) $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw \ $(CLASSLIST_FILE_VM_OPTS) \ + -Xlog:cds=off \ -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \ build.tools.classlist.HelloClasslist $(LOG_DEBUG) $(GREP) -v HelloClasslist $@.raw > $@.interim $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -Xshare:dump \ + -Xlog:cds=off \ -XX:SharedClassListFile=$@.interim -XX:SharedArchiveFile=$@.jsa \ -Xmx128M -Xms128M $(LOG_INFO) $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java -XX:DumpLoadedClassList=$@.raw.2 \ @@ -87,6 +89,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST -Djava.lang.invoke.MethodHandle.TRACE_RESOLVE=true \ $(CLASSLIST_FILE_VM_OPTS) \ --module-path $(SUPPORT_OUTPUTDIR)/classlist.jar \ + -Xlog:cds=off \ -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \ build.tools.classlist.HelloClasslist \ 2> $(LINK_OPT_DIR)/stderr > $(JLI_TRACE_FILE) \ @@ -100,6 +103,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST $(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3 $(GREP) -v @cp $@.raw.3 > $@.raw.4 $(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \ + -Xlog:cds=off \ -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \ build.tools.classlist.SortClasslist $@.raw.4 > $@