stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8025936: Windows .pdb and .map files does not have proper dependencies setup

Browse Source 
Reviewed-by: ihse, tbell
This commit is contained in:
Erik Joelsson 2014-01-14 12:05:46 +01:00
parent a635170108
commit f607277df0
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/make/CompileLaunchers.gmk
View File

@ -437,6 +437,7 @@ UNPACKEXE_LANG := C
ifeq ($(OPENJDK_TARGET_OS), solaris) ifeq ($(OPENJDK_TARGET_OS), solaris)
UNPACKEXE_LANG := C++ UNPACKEXE_LANG := C++
endif endif
UNPACKEXE_DEBUG_SYMBOLS := true
# On windows, unpack200 is linked completely differently to all other # On windows, unpack200 is linked completely differently to all other
# executables, using the compiler with the compiler arguments. # executables, using the compiler with the compiler arguments.
# It's also linked incrementally, producing a .ilk file that needs to # It's also linked incrementally, producing a .ilk file that needs to
@ -445,6 +446,9 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
BUILD_UNPACKEXE_LDEXE := $(CC) BUILD_UNPACKEXE_LDEXE := $(CC)
EXE_OUT_OPTION_save := $(EXE_OUT_OPTION) EXE_OUT_OPTION_save := $(EXE_OUT_OPTION)
EXE_OUT_OPTION := -Fe EXE_OUT_OPTION := -Fe
# With the current way unpack200 is built, debug symbols aren't supported
# anyway.
UNPACKEXE_DEBUG_SYMBOLS :=
endif endif
$(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \
SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \ SRC := $(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack, \
@ -474,7 +478,7 @@ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \
-D "JDK_FNAME=unpack200.exe" \ -D "JDK_FNAME=unpack200.exe" \
-D "JDK_INTERNAL_NAME=unpack200" \ -D "JDK_INTERNAL_NAME=unpack200" \
-D "JDK_FTYPE=0x1L", \ -D "JDK_FTYPE=0x1L", \
DEBUG_SYMBOLS := true, \ DEBUG_SYMBOLS := $(UNPACKEXE_DEBUG_SYMBOLS), \
MANIFEST := $(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest)) MANIFEST := $(JDK_TOPDIR)/src/windows/resource/unpack200_proto.exe.manifest))
ifeq ($(OPENJDK_TARGET_OS), windows) ifeq ($(OPENJDK_TARGET_OS), windows)

10
jdk/make/lib/CoreLibraries.gmk
View File

@ -310,16 +310,6 @@ $(BUILD_LIBUNPACK): $(BUILD_LIBJAVA)
BUILD_LIBRARIES += $(BUILD_LIBUNPACK) 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 BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/share/bin $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin