From f426a130ddf9397efe4ffcebd478352d63c7afae Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 10 Sep 2024 14:12:26 +0100 Subject: [PATCH 1/4] Remove jck native make of systemInfo for jck-23+ Signed-off-by: Andrew Leonard --- jck/jtrunner/makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jck/jtrunner/makefile b/jck/jtrunner/makefile index b71fc6c30e..d88a25d5c0 100644 --- a/jck/jtrunner/makefile +++ b/jck/jtrunner/makefile @@ -248,10 +248,14 @@ ifeq ($(OS),win) RANDOMGEN=cd $(FULLOUTDIR) && $(LINK_CMD) $(LFLAGS)"$(FULLOUTDIR)$(D)$@" $(FULLOUTDIR)$(D)com_sun_management_mbeans_loading_RandomGen.obj endif -ifeq ($(shell test $(JDK_VERSION) -ge 19; echo $$?),0) - OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)systemInfo.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT) +ifeq ($(shell test $(JDK_VERSION) -ge 23; echo $$?),0) + OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT) else + ifeq ($(shell test $(JDK_VERSION) -ge 19; echo $$?),0) + OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)systemInfo.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT) + else OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)systemInfo.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT) + endif endif CFLAGS := $(CFLAGS) -I"$(SRCDIR)" -I"$(JNI_INCLUDE_PATH)" -I"$(JVMTI_INCLUDE_PATH)" @@ -315,9 +319,11 @@ $(LIBPREF)jckforeign.$(LIBEXT):SymbolLookup.c Linker.c cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $^ $(OFLAG)$(FULLOUTDIR)$(VAR) $(JCKFOREIGN) +ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0) $(LIBPREF)systemInfo.$(LIBEXT):com_sun_management_mbeans_loading_SystemInfoUseNativeLib.c cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $< $(OFLAG)$(VAR) $(SYSTEMINFOUSENATIVE) +endif $(LIBPREF)jmxlibid.$(LIBEXT):com_sun_management_mbeans_loading_GetLibIdFromNativeLib.c cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $< $(OFLAG)$(VAR) @@ -334,11 +340,15 @@ createdir: installjmx: ifneq ($(OS),win) $(COPYDIR) $(SRCDIR)$(D)tests$(D)api$(D)javax_management$(D)loading$(D)data$(D)* $(FULLOUTDIR)$(D). + ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0) cd $(FULLOUTDIR) && $(JAR) uf $(FULLOUTDIR)/archives/MBeanUseNativeLib.jar $(LIBPREF)systemInfo.$(LIBEXT) + endif cd $(FULLOUTDIR) && $(JAR) cf $(FULLOUTDIR)/archives/OnlyLibs.jar $(LIBPREF)jmxlibid.$(LIBEXT) else $(COPYDIR) "$(JMX_DATA_PATH)$(D)." "$(FULLOUTDIR)$(D)" + ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0) cd "$(FULLOUTDIR)" && $(JAR) uf "$(FULLOUTDIR)$(D)archives$(D)MBeanUseNativeLib.jar" $(LIBPREF)systemInfo.$(LIBEXT) + endif cd "$(FULLOUTDIR)" && $(JAR) cf "$(FULLOUTDIR)$(D)archives$(D)OnlyLibs.jar" $(LIBPREF)jmxlibid.$(LIBEXT) endif From d25a9844853fd1246620023fe19dca0e69946a27 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 10 Sep 2024 14:19:20 +0100 Subject: [PATCH 2/4] Remove jck native make of libjmxlibid for jck-23+ Signed-off-by: Andrew Leonard --- jck/jtrunner/makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jck/jtrunner/makefile b/jck/jtrunner/makefile index d88a25d5c0..5e4bbab5fb 100644 --- a/jck/jtrunner/makefile +++ b/jck/jtrunner/makefile @@ -249,7 +249,7 @@ ifeq ($(OS),win) endif ifeq ($(shell test $(JDK_VERSION) -ge 23; echo $$?),0) - OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT) + OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT) else ifeq ($(shell test $(JDK_VERSION) -ge 19; echo $$?),0) OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)systemInfo.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT) @@ -323,11 +323,11 @@ ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0) $(LIBPREF)systemInfo.$(LIBEXT):com_sun_management_mbeans_loading_SystemInfoUseNativeLib.c cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $< $(OFLAG)$(VAR) $(SYSTEMINFOUSENATIVE) -endif $(LIBPREF)jmxlibid.$(LIBEXT):com_sun_management_mbeans_loading_GetLibIdFromNativeLib.c cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $< $(OFLAG)$(VAR) $(GETLIBIDFROMNATIVE) +endif $(LIBPREF)genrandom.$(LIBEXT):com_sun_management_mbeans_loading_RandomGen.c cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $< $(OFLAG)$(FULLOUTDIR)$(VAR) @@ -342,14 +342,14 @@ ifneq ($(OS),win) $(COPYDIR) $(SRCDIR)$(D)tests$(D)api$(D)javax_management$(D)loading$(D)data$(D)* $(FULLOUTDIR)$(D). ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0) cd $(FULLOUTDIR) && $(JAR) uf $(FULLOUTDIR)/archives/MBeanUseNativeLib.jar $(LIBPREF)systemInfo.$(LIBEXT) - endif cd $(FULLOUTDIR) && $(JAR) cf $(FULLOUTDIR)/archives/OnlyLibs.jar $(LIBPREF)jmxlibid.$(LIBEXT) + endif else $(COPYDIR) "$(JMX_DATA_PATH)$(D)." "$(FULLOUTDIR)$(D)" ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0) cd "$(FULLOUTDIR)" && $(JAR) uf "$(FULLOUTDIR)$(D)archives$(D)MBeanUseNativeLib.jar" $(LIBPREF)systemInfo.$(LIBEXT) - endif cd "$(FULLOUTDIR)" && $(JAR) cf "$(FULLOUTDIR)$(D)archives$(D)OnlyLibs.jar" $(LIBPREF)jmxlibid.$(LIBEXT) + endif endif .PHONY clean: From aadf6c7f2ce4cb722af303aabd3fd9145d4778fb Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 10 Sep 2024 14:22:26 +0100 Subject: [PATCH 3/4] Remove jck native make of libgenrandom for jck-23+ Signed-off-by: Andrew Leonard --- jck/jtrunner/makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jck/jtrunner/makefile b/jck/jtrunner/makefile index 5e4bbab5fb..8104082553 100644 --- a/jck/jtrunner/makefile +++ b/jck/jtrunner/makefile @@ -249,7 +249,7 @@ ifeq ($(OS),win) endif ifeq ($(shell test $(JDK_VERSION) -ge 23; echo $$?),0) - OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT) + OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) else ifeq ($(shell test $(JDK_VERSION) -ge 19; echo $$?),0) OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)systemInfo.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT) @@ -327,11 +327,11 @@ $(LIBPREF)systemInfo.$(LIBEXT):com_sun_management_mbeans_loading_SystemInfoUseNa $(LIBPREF)jmxlibid.$(LIBEXT):com_sun_management_mbeans_loading_GetLibIdFromNativeLib.c cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $< $(OFLAG)$(VAR) $(GETLIBIDFROMNATIVE) -endif $(LIBPREF)genrandom.$(LIBEXT):com_sun_management_mbeans_loading_RandomGen.c cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $< $(OFLAG)$(FULLOUTDIR)$(VAR) $(RANDOMGEN) +endif createdir: $(CLEANDIR) $(FULLOUTDIR) From bc1eda6eaacf1bb90bbebfbd556a6a8750295ffc Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Tue, 10 Sep 2024 14:28:15 +0100 Subject: [PATCH 4/4] Remove jck native make of libgenrandom for jck-23+ Signed-off-by: Andrew Leonard --- jck/jtrunner/makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jck/jtrunner/makefile b/jck/jtrunner/makefile index 8104082553..ed00cd5dba 100644 --- a/jck/jtrunner/makefile +++ b/jck/jtrunner/makefile @@ -338,18 +338,18 @@ createdir: $(MKDIR) $(FULLOUTDIR) installjmx: +ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0) ifneq ($(OS),win) $(COPYDIR) $(SRCDIR)$(D)tests$(D)api$(D)javax_management$(D)loading$(D)data$(D)* $(FULLOUTDIR)$(D). - ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0) cd $(FULLOUTDIR) && $(JAR) uf $(FULLOUTDIR)/archives/MBeanUseNativeLib.jar $(LIBPREF)systemInfo.$(LIBEXT) cd $(FULLOUTDIR) && $(JAR) cf $(FULLOUTDIR)/archives/OnlyLibs.jar $(LIBPREF)jmxlibid.$(LIBEXT) - endif else $(COPYDIR) "$(JMX_DATA_PATH)$(D)." "$(FULLOUTDIR)$(D)" - ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0) cd "$(FULLOUTDIR)" && $(JAR) uf "$(FULLOUTDIR)$(D)archives$(D)MBeanUseNativeLib.jar" $(LIBPREF)systemInfo.$(LIBEXT) cd "$(FULLOUTDIR)" && $(JAR) cf "$(FULLOUTDIR)$(D)archives$(D)OnlyLibs.jar" $(LIBPREF)jmxlibid.$(LIBEXT) - endif +endif +else + echo "JMX not required for jdk-23+" endif .PHONY clean: