Skip to content

Commit 82bdef1

Browse files
committed
8367913: LIBDL dependency seems to be not needed for some jdk libs
Reviewed-by: aivanov, ihse, clanger, mdoerr
1 parent 4df04a2 commit 82bdef1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

make/modules/java.base/Lib.gmk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ endif
154154

155155
################################################################################
156156
## Build libsyslookup
157+
## The LIBDL dependency on Linux is needed to dynamically access libdl symbols,
158+
## which may be needed as part of resolving some standard symbols
157159
################################################################################
158160

159161
$(eval $(call SetupJdkLibrary, BUILD_LIBSYSLOOKUP, \
@@ -196,7 +198,7 @@ ifeq ($(call isTargetOs, linux)+$(call isTargetCpu, x86_64)+$(INCLUDE_COMPILER2)
196198
OPTIMIZATION := HIGH, \
197199
CXXFLAGS := -std=c++17, \
198200
DISABLED_WARNINGS_gcc := unused-variable, \
199-
LIBS_linux := $(LIBDL) $(LIBM), \
201+
LIBS_linux := $(LIBM), \
200202
))
201203

202204
TARGETS += $(BUILD_LIBSIMD_SORT)

make/modules/java.desktop/lib/ClientLibraries.gmk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBMLIB_IMAGE, \
5151
$(LIBMLIB_IMAGE_CFLAGS), \
5252
DISABLED_WARNINGS_gcc := unused-function, \
5353
DISABLED_WARNINGS_clang_mlib_ImageCreate.c := unused-function, \
54-
LIBS_unix := $(LIBDL) $(LIBM), \
54+
LIBS_unix := $(LIBM), \
5555
))
5656

5757
TARGETS += $(BUILD_LIBMLIB_IMAGE)
@@ -264,7 +264,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
264264
JDK_LIBS_macosx := libosxapp, \
265265
LIBS := $(GIFLIB_LIBS) $(LIBJPEG_LIBS) $(LIBZ_LIBS) $(PNG_LIBS) $(ICONV_LIBS), \
266266
LIBS_unix := $(LIBM) $(LIBPTHREAD), \
267-
LIBS_linux := $(LIBDL) $(X_LIBS) -lX11 -lXext, \
267+
LIBS_linux := $(X_LIBS) -lX11 -lXext, \
268268
LIBS_macosx := \
269269
-framework ApplicationServices \
270270
-framework Cocoa \

make/modules/java.instrument/Lib.gmk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBINSTRUMENT, \
4343
JDK_LIBS := java.base:libjava java.base:libjli java.base:libjvm, \
4444
LIBS := $(ICONV_LIBS), \
4545
LIBS_unix := $(LIBZ_LIBS), \
46-
LIBS_linux := $(LIBDL), \
47-
LIBS_aix := $(LIBDL), \
4846
LIBS_macosx := \
4947
-framework ApplicationServices \
5048
-framework Cocoa \

0 commit comments

Comments
 (0)