Changeset 245 for trunk


Ignore:
Timestamp:
Jan 20, 2011, 2:29:47 AM (15 years ago)
Author:
dmik
Message:

make: Added rules to instantly generate .sym files out of .map.

Location:
trunk/openjdk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/hotspot/make/Makefile

    r42 r245  
    261261$(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb
    262262        $(install-file)
     263  else
     264$(EXPORT_JRE_BIN_DIR)/%.sym: $(MISC_DIR)/%.sym
     265        $(install-file)
    263266  endif
    264267$(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map
    … …  
    271274$(EXPORT_CLIENT_DIR)/%.pdb:  $(C1_DIR)/%.pdb
    272275        $(install-file)
     276  else
     277$(EXPORT_CLIENT_DIR)/%.sym:  $(C1_DIR)/%.sym
     278        $(install-file)
    273279  endif
    274280$(EXPORT_CLIENT_DIR)/%.map:  $(C1_DIR)/%.map
    … …  
    281287$(EXPORT_SERVER_DIR)/%.pdb:  $(C2_DIR)/%.pdb
    282288        $(install-file)
     289  else
     290$(EXPORT_SERVER_DIR)/%.sym:  $(C2_DIR)/%.sym
     291        $(install-file)
    283292  endif
    284293$(EXPORT_SERVER_DIR)/%.map:  $(C2_DIR)/%.map
    … …  
    290299  ifneq ($(OSNAME),os2)
    291300$(EXPORT_KERNEL_DIR)/%.pdb:  $(KERNEL_DIR)/%.pdb
     301        $(install-file)
     302  else
     303$(EXPORT_KERNEL_DIR)/%.sym:  $(KERNEL_DIR)/%.sym
    292304        $(install-file)
    293305  endif

  • trunk/openjdk/hotspot/make/os2/makefiles/compile.make

    r221 r245  
    7070IMPLIB = emximp
    7171
     72MAPSYM = mapsym.exe
     73
    7274# Odin SDK
    7375

  • trunk/openjdk/hotspot/make/os2/makefiles/debug.make

    r120 r245  
    5656        $(LINK) $(LINK_FLAGS) -o $@ $(Def_File) $(Obj_Files) $(Res_Files)
    5757        $(IMPLIB) -o $(basename $@).lib $@
     58        cd $(@D) && $(MAPSYM) $(basename $(@F)).map
    5859
    5960include $(WorkSpace)/make/os2/makefiles/shared.make

  • trunk/openjdk/hotspot/make/os2/makefiles/defs.make

    r40 r245  
    9090EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll
    9191EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
     92EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.sym
    9293EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
    9394EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
    … …  
    9596EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll
    9697EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
     98EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.sym
    9799# kernel vm
    98100EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
    … …  
    100102EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll
    101103EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
     104EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.sym
    102105
    103106ifeq ($(BUILD_OS2_SA), 1)
    104107  EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/saos2dbg.dll
    105108  EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/saos2dbg.map
     109  EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/saos2dbg.sym
    106110  EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
    107111  # Must pass this down to make.

  • trunk/openjdk/hotspot/make/os2/makefiles/product.make

    r131 r245  
    5757        $(LINK) $(LINK_FLAGS) -o $@ $(Def_File) $(Obj_Files) $(Res_Files)
    5858        $(IMPLIB) -o $(basename $@).lib $@
     59        cd $(@D) && $(MAPSYM) $(basename $(@F)).map
    5960
    6061include $(WorkSpace)/make/os2/makefiles/shared.make

  • trunk/openjdk/jdk/make/common/Library.gmk

    r201 r245  
    249249        $(LINK) $(LDFLAGS) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS) $(DEF_FILE)
    250250        $(IMPLIB) -o $(OBJDIR)/$(LIBRARY).lib $@
     251        cd $(@D) && $(MAPSYM) $(basename $(@F)).map
    251252endif # LIBRARY
    252253

  • trunk/openjdk/jdk/make/common/Program.gmk

    r89 r245  
    175175ifeq ($(PLATFORM), os2)
    176176
    177 $(ACTUAL_PROGRAM):: $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
    178         @$(install-file)
    179 
    180 $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(FILES_o)
     177$(ACTUAL_PROGRAM):: $(FILES_o)
    181178        @$(prep-target)
    182179        @set -- $?; \
    183180            $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
    184181        $(LINK) $(LDFLAGS) -Zstack 0x2000 -o $@ $(FILES_o) $(LDLIBS)
     182        cd $(@D) && $(MAPSYM) $(basename $(@F)).map
    185183
    186184else # PLATFORM == os2

  • trunk/openjdk/jdk/make/common/shared/Compiler-gcc.gmk

    r222 r245  
    7272  AR           = $(COMPILER_PATH)emxomfar
    7373  IMPLIB       = $(COMPILER_PATH)emximp
     74  MAPSYM       = mapsym.exe
    7475
    7576  # Option used to create a shared library

  • trunk/openjdk/jdk/make/java/redist/Makefile

    r73 r245  
    173173        $(install-import-file)
    174174
    175 # it is OK for the .map and .sym files to not exist, so do not force a
    176 # dependency on them from the bootstrap location, and allow the copy to fail.
    177 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME):
    178         @$(prep-target)
    179         -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME)  $@
    180 
    181 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME):
    182         @$(prep-target)
    183         -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME) $@
    184 
    185 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMSYM_NAME):
    186         @$(prep-target)
    187         -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMSYM_NAME)  $@
    188 
    189 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMSYM_NAME):
    190         @$(prep-target)
    191         -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMSYM_NAME) $@
     175$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME)
     176        $(install-import-file)
     177
     178$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME)
     179        $(install-import-file)
     180
     181$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMSYM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMSYM_NAME)
     182        $(install-import-file)
     183
     184$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMSYM_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMSYM_NAME)
     185        $(install-import-file)
    192186
    193187#  OS/2        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  OS/2
Note: See TracChangeset for help on using the changeset viewer.