From 684e50690c54fb93cb411553a8798cce041faac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= Date: Fri, 30 Dec 2022 06:40:27 +0000 Subject: [PATCH] 8299260: libawt and libfreetype should export only explicitly requested symbols Reviewed-by: prr, aivanov, serb --- make/common/modules/LibCommon.gmk | 3 --- make/modules/java.desktop/lib/Awt2dLibraries.gmk | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/make/common/modules/LibCommon.gmk b/make/common/modules/LibCommon.gmk index aa5c9f0a5c6..2450d2d1e03 100644 --- a/make/common/modules/LibCommon.gmk +++ b/make/common/modules/LibCommon.gmk @@ -41,15 +41,12 @@ ifeq ($(TOOLCHAIN_TYPE), gcc) CFLAGS_JDKLIB += -fvisibility=hidden CXXFLAGS_JDKLIB += -fvisibility=hidden LDFLAGS_JDKLIB += -Wl,--exclude-libs,ALL - EXPORT_ALL_SYMBOLS := -fvisibility=default else ifeq ($(TOOLCHAIN_TYPE), clang) CFLAGS_JDKLIB += -fvisibility=hidden CXXFLAGS_JDKLIB += -fvisibility=hidden - EXPORT_ALL_SYMBOLS := -fvisibility=default else ifeq ($(TOOLCHAIN_TYPE), xlc) CFLAGS_JDKLIB += -qvisibility=hidden CXXFLAGS_JDKLIB += -qvisibility=hidden - EXPORT_ALL_SYMBOLS := -qvisibility=default endif # Put the libraries here. diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk index e32277d4a42..fecd7a957bc 100644 --- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk +++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk @@ -120,11 +120,6 @@ ifeq ($(call isTargetOs, windows), true) LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/$(MODULE)/windows/native/libawt/windows/awt.rc endif -ifeq ($(call isTargetOs, linux), true) - # FIXME: This is probably not what we want to do, but keep it now for compatibility. - LIBAWT_CFLAGS += $(EXPORT_ALL_SYMBOLS) -endif - # Turn off all warnings for debug_mem.c This is needed because the specific warning # about initializing a declared 'extern' cannot be turned off individually. Only # applies to debug builds. This limitation in gcc is tracked in @@ -414,7 +409,7 @@ ifeq ($(FREETYPE_TO_USE), system) LIBFREETYPE_LIBS := $(FREETYPE_LIBS) else BUILD_LIBFREETYPE_HEADER_DIRS := $(TOPDIR)/src/$(MODULE)/share/native/libfreetype/include - BUILD_LIBFREETYPE_CFLAGS := -DFT2_BUILD_LIBRARY $(EXPORT_ALL_SYMBOLS) + BUILD_LIBFREETYPE_CFLAGS := -DFT2_BUILD_LIBRARY # For use by libfontmanager: LIBFREETYPE_CFLAGS := -I$(BUILD_LIBFREETYPE_HEADER_DIRS)