make/lib/Awt2dLibraries.gmk
branchihse-jdk-library-branch
changeset 56434 69b4183fd7b8
parent 56433 c3cf838aa2da
parent 49697 59c4713c5d21
child 56435 e177cddcbf77
equal deleted inserted replaced
56433:c3cf838aa2da 56434:69b4183fd7b8
   379     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
   379     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
   380     DISABLED_WARNINGS_microsoft := 4819, \
   380     DISABLED_WARNINGS_microsoft := 4819, \
   381     LDFLAGS := $(LDFLAGS_JDKLIB) \
   381     LDFLAGS := $(LDFLAGS_JDKLIB) \
   382         $(call SET_SHARED_LIBRARY_ORIGIN), \
   382         $(call SET_SHARED_LIBRARY_ORIGIN), \
   383     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   383     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   384     LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
   384     LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS) $(LIBM), \
   385     LIBS_unix := -lawt -ljvm -ljava $(LCMS_LIBS), \
       
   386     LIBS_linux := $(LIBM), \
       
   387     LIBS_macosx := $(LIBM), \
       
   388     LIBS_aix := $(LIBM),\
       
   389     LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
   385     LIBS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
   390 ))
   386 ))
   391 
   387 
   392 TARGETS += $(BUILD_LIBLCMS)
   388 TARGETS += $(BUILD_LIBLCMS)
   393 
   389 
   608   BUILD_LIBFONTMANAGER_sunFont.c_CFLAGS := -w
   604   BUILD_LIBFONTMANAGER_sunFont.c_CFLAGS := -w
   609   # Turn off aliasing with GCC for ExtensionSubtables.cpp
   605   # Turn off aliasing with GCC for ExtensionSubtables.cpp
   610   BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
   606   BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
   611 endif
   607 endif
   612 
   608 
       
   609 # LDFLAGS clarification:
       
   610 #   Filter relevant linker flags disallowing unresolved symbols as we cannot
       
   611 #   build-time decide to which library to link against (libawt_headless or
       
   612 #   libawt_xawt). See JDK-8196516 for details.
   613 $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
   613 $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
   614     NAME := fontmanager, \
   614     NAME := fontmanager, \
   615     EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
   615     EXCLUDE_FILES := $(LIBFONTMANAGER_EXCLUDE_FILES) \
   616         AccelGlyphCache.c, \
   616         AccelGlyphCache.c, \
   617     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
   617     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
   633         E_ENUM_VAL_OVERFLOWS_INT_MAX, \
   633         E_ENUM_VAL_OVERFLOWS_INT_MAX, \
   634     DISABLED_WARNINGS_CXX_solstudio := \
   634     DISABLED_WARNINGS_CXX_solstudio := \
   635         truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
   635         truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \
   636         hidevf w_novirtualdescr arrowrtn2, \
   636         hidevf w_novirtualdescr arrowrtn2, \
   637     DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
   637     DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819 4101, \
   638     LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \
   638     LDFLAGS := $(subst -Xlinker -z -Xlinker defs,, \
       
   639         $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB))) $(LDFLAGS_CXX_JDK) \
   639         $(call SET_SHARED_LIBRARY_ORIGIN), \
   640         $(call SET_SHARED_LIBRARY_ORIGIN), \
   640     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   641     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
   641     LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
   642     LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
   642     LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
   643     LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
   643     LIBS_aix := -lawt_headless, \
   644     LIBS_aix := -lawt_headless, \