diff --git a/make/modules/java.base/Lib.gmk b/make/modules/java.base/Lib.gmk index 51d323a0344..41da22f8cb2 100644 --- a/make/modules/java.base/Lib.gmk +++ b/make/modules/java.base/Lib.gmk @@ -154,6 +154,8 @@ endif ################################################################################ ## Build libsyslookup +## The LIBDL dependency on Linux is needed to dynamically access libdl symbols, +## which may be needed as part of resolving some standard symbols ################################################################################ $(eval $(call SetupJdkLibrary, BUILD_LIBSYSLOOKUP, \ @@ -196,7 +198,7 @@ ifeq ($(call isTargetOs, linux)+$(call isTargetCpu, x86_64)+$(INCLUDE_COMPILER2) OPTIMIZATION := HIGH, \ CXXFLAGS := -std=c++17, \ DISABLED_WARNINGS_gcc := unused-variable, \ - LIBS_linux := $(LIBDL) $(LIBM), \ + LIBS_linux := $(LIBM), \ )) TARGETS += $(BUILD_LIBSIMD_SORT) diff --git a/make/modules/java.desktop/lib/ClientLibraries.gmk b/make/modules/java.desktop/lib/ClientLibraries.gmk index a69b65180d7..2c29092cdd6 100644 --- a/make/modules/java.desktop/lib/ClientLibraries.gmk +++ b/make/modules/java.desktop/lib/ClientLibraries.gmk @@ -51,7 +51,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \ $(LIBMLIB_IMAGE_CFLAGS), \ DISABLED_WARNINGS_gcc := unused-function, \ DISABLED_WARNINGS_clang_mlib_ImageCreate.c := unused-function, \ - LIBS_unix := $(LIBDL) $(LIBM), \ + LIBS_unix := $(LIBM), \ )) TARGETS += $(BUILD_LIBMLIB_IMAGE) @@ -264,7 +264,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false) JDK_LIBS_macosx := libosxapp, \ LIBS := $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(LIBZ_LIBS) $(PNG_LIBS) $(ICONV_LIBS), \ LIBS_unix := $(LIBM) $(LIBPTHREAD), \ - LIBS_linux := $(LIBDL) $(X_LIBS) -lX11 -lXext, \ + LIBS_linux := $(X_LIBS) -lX11 -lXext, \ LIBS_macosx := \ -framework ApplicationServices \ -framework Cocoa \ diff --git a/make/modules/java.instrument/Lib.gmk b/make/modules/java.instrument/Lib.gmk index 609814c86ed..4181cdf81c9 100644 --- a/make/modules/java.instrument/Lib.gmk +++ b/make/modules/java.instrument/Lib.gmk @@ -43,8 +43,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \ JDK_LIBS := java.base:libjava java.base:libjli java.base:libjvm, \ LIBS := $(ICONV_LIBS), \ LIBS_unix := $(LIBZ_LIBS), \ - LIBS_linux := $(LIBDL), \ - LIBS_aix := $(LIBDL), \ LIBS_macosx := \ -framework ApplicationServices \ -framework Cocoa \