Mercurial > hg > openjdk > jdk8u > jdk
changeset 14179:3fbfec3d8646
8025936: Windows .pdb and .map files does not have proper dependencies setup
Reviewed-by: andrew
author | aleonard |
---|---|
date | Thu, 20 Aug 2020 05:16:24 -0700 |
parents | e78cf577654b |
children | 885f7ab464de |
files | make/CompileLaunchers.gmk make/lib/CoreLibraries.gmk |
diffstat | 2 files changed, 5 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CompileLaunchers.gmk Mon Aug 31 07:09:57 2020 +0100 +++ b/make/CompileLaunchers.gmk Thu Aug 20 05:16:24 2020 -0700 @@ -462,6 +462,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris) UNPACKEXE_LANG := C++ endif +UNPACKEXE_DEBUG_SYMBOLS := true # On windows, unpack200 is linked completely differently to all other # executables, using the compiler with the compiler arguments. # It's also linked incrementally, producing a .ilk file that needs to @@ -470,6 +471,9 @@ BUILD_UNPACKEXE_LDEXE := $(CC) EXE_OUT_OPTION_save := $(EXE_OUT_OPTION) EXE_OUT_OPTION := -Fe + # With the current way unpack200 is built, debug symbols aren't supported + # anyway. + UNPACKEXE_DEBUG_SYMBOLS := endif # The linker on older SuSE distros (e.g. on SLES 10) complains with: @@ -509,7 +513,7 @@ -D "JDK_FNAME=unpack200.exe" \ -D "JDK_INTERNAL_NAME=unpack200" \ -D "JDK_FTYPE=0x1L", \ - DEBUG_SYMBOLS := true, \ + DEBUG_SYMBOLS := $(UNPACKEXE_DEBUG_SYMBOLS), \ MANIFEST := $(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest)) ifeq ($(OPENJDK_TARGET_OS), windows)
--- a/make/lib/CoreLibraries.gmk Mon Aug 31 07:09:57 2020 +0100 +++ b/make/lib/CoreLibraries.gmk Thu Aug 20 05:16:24 2020 -0700 @@ -341,16 +341,6 @@ BUILD_LIBRARIES += $(BUILD_LIBUNPACK) -ifeq ($(OPENJDK_TARGET_OS), windows) - $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.map: $(BUILD_LIBUNPACK) - $(ECHO) Copying $(@F) - $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.map, $<) $@ - - $(INSTALL_LIBRARIES_HERE)/$(LIBRARY_PREFIX)unpack.pdb: $(BUILD_LIBUNPACK) - $(ECHO) Copying $(@F) - $(CP) $(patsubst %$(SHARED_LIBRARY_SUFFIX), %.pdb, $<) $@ -endif - ########################################################################################## BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin