make/common/Program.gmk

*** 169,187 ****
    IMVERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
    $(OBJDIR)/$(PROGRAM).exe.manifest: $(JDK_TOPDIR)/src/windows/resource/java.manifest
          @$(prep-target)
          $(SED) 's%IMVERSION%$(IMVERSION)%g;s%PROGRAM%$(PROGRAM)%g' $< > $@
  
    # We used a hand-crafted manifest file for all executables.
    # It is tweaked to embed the build number and executable name.
    # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
    $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(OBJDIR)/$(PROGRAM).lcf $(FILES_o) $(JLI_LCF) $(OBJDIR)/$(PROGRAM).exe.manifest
          @$(prep-target)
          @set -- $?; \
              $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
          $(LINK) -out:$@ /STACK:$(STACK_SIZE) \
!             -map:$(OBJDIR)/$(PROGRAM).map $(LFLAGS) $(LDFLAGS) \
              @$(OBJDIR)/$(PROGRAM).lcf $(LDLIBS)
    ifdef MT
          $(MT) /manifest $(OBJDIR)/$(PROGRAM).exe.manifest /outputresource:$@;#1
    endif
          @$(call binary_file_verification,$@)
--- 169,191 ----
    IMVERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
    $(OBJDIR)/$(PROGRAM).exe.manifest: $(JDK_TOPDIR)/src/windows/resource/java.manifest
          @$(prep-target)
          $(SED) 's%IMVERSION%$(IMVERSION)%g;s%PROGRAM%$(PROGRAM)%g' $< > $@
  
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+   MAP_OPTION="-map:$(OBJDIR)/$(PROGRAM).map"
+ endif
+ 
    # We used a hand-crafted manifest file for all executables.
    # It is tweaked to embed the build number and executable name.
    # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
    $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(OBJDIR)/$(PROGRAM).lcf $(FILES_o) $(JLI_LCF) $(OBJDIR)/$(PROGRAM).exe.manifest
          @$(prep-target)
          @set -- $?; \
              $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
          $(LINK) -out:$@ /STACK:$(STACK_SIZE) \
!             $(MAP_OPTION) $(LFLAGS) $(LDFLAGS) \
              @$(OBJDIR)/$(PROGRAM).lcf $(LDLIBS)
    ifdef MT
          $(MT) /manifest $(OBJDIR)/$(PROGRAM).exe.manifest /outputresource:$@;#1
    endif
          @$(call binary_file_verification,$@)