Skip to content

Commit 0f70aae

Browse files
Evgeny Nikitinchhagedorn
Evgeny Nikitin
authored andcommitted
8353841: [jittester] Fix JITTester build after asm removal
Reviewed-by: thartmann, chagedorn
1 parent 3340e13 commit 0f70aae

File tree

1 file changed

+10
-4
lines changed
  • test/hotspot/jtreg/testlibrary/jittester

1 file changed

+10
-4
lines changed

test/hotspot/jtreg/testlibrary/jittester/Makefile

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -83,6 +83,8 @@ TESTLIBRARY_SRC_FILES = $(TESTLIBRARY_SRC_DIR)/Asserts.java \
8383
$(TESTLIBRARY_SRC_DIR)/util/FileUtils.java \
8484
$(TESTLIBRARY_SRC_DIR)/util/Pair.java
8585

86+
ASM_SRC_DIR = ../asm/org/objectweb/asm/
87+
8688
.PHONY: cleantmp
8789

8890
all: $(DIST_JAR)
@@ -95,11 +97,15 @@ manifest:
9597
@echo 'X-COMMENT: Main-Class will be added automatically by build' >> $(MANIFEST)
9698
@echo 'Main-Class: jdk.test.lib.jittester.Automatic' >> $(MANIFEST)
9799

100+
compile_asm: INIT
101+
$(shell find $(ASM_SRC_DIR) -name '*.java' > $(CLASSES_DIR)/filelist_asm)
102+
${JAVAC} -d $(CLASSES_DIR) @$(CLASSES_DIR)/filelist_asm
103+
98104
compile_testlib: INIT
99-
$(JAVAC) -XDignore.symbol.file --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED --add-exports=java.base/org.objectweb.asm=ALL-UNNAMED -Xlint $(TESTLIBRARY_SRC_FILES) -d $(CLASSES_DIR)
105+
$(JAVAC) -XDignore.symbol.file --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED -Xlint $(TESTLIBRARY_SRC_FILES) -d $(CLASSES_DIR)
100106

101-
COMPILE: INIT filelist compile_testlib
102-
$(JAVAC) -cp $(CLASSES_DIR) -XDignore.symbol.file --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED --add-exports=java.base/org.objectweb.asm=ALL-UNNAMED -Xlint -sourcepath $(SRC_DIR) -d $(CLASSES_DIR) @filelist
107+
COMPILE: INIT filelist compile_asm compile_testlib
108+
$(JAVAC) -cp $(CLASSES_DIR) -XDignore.symbol.file --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED -Xlint -sourcepath $(SRC_DIR) -d $(CLASSES_DIR) @filelist
103109

104110
filelist: $(SRC_FILES)
105111
@rm -f $@

0 commit comments

Comments
 (0)