Changeset 448


Ignore:
Timestamp:
Aug 27, 2016, 10:15:50 PM (9 years ago)
Author:
dmik
Message:

Remove SYM file generation on OS/2.

This doesn't make any practical sense as there is embedded HLL debug
info which is much more verbose than SYM and doesn't require separate
files (it is generated when -g option is passed to gcc).

This commint also removes the dependency on mapsym.exe and wmapsym.cmd.

Location:
trunk/openjdk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk/corba/make/common/Library.gmk

    r278 r448  
    208208        $(LINK) $(LDFLAGS) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS) $(DEF_FILE)
    209209        $(IMPLIB) -o $(OBJDIR)/$(LIBRARY).lib $@
    210         cd $(@D) && $(MAPSYM) $(basename $(@F)).map
    211210
    212211#
  • trunk/openjdk/corba/make/common/shared/Compiler-gcc.gmk

    r331 r448  
    6767  AR           = $(COMPILER_PATH)emxomfar
    6868  IMPLIB       = $(COMPILER_PATH)emximp
    69   MAPSYM       = mapsym.exe
    7069
    7170  # Option used to create a shared library
  • trunk/openjdk/hotspot/make/Makefile

    r278 r448  
    291291$(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb
    292292        $(install-file)
    293   else
    294 $(EXPORT_JRE_BIN_DIR)/%.sym: $(MISC_DIR)/%.sym
    295         $(install-file)
    296293  endif
    297294$(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map
     
    304301$(EXPORT_CLIENT_DIR)/%.pdb:  $(C1_DIR)/%.pdb
    305302        $(install-file)
    306   else
    307 $(EXPORT_CLIENT_DIR)/%.sym:  $(C1_DIR)/%.sym
    308         $(install-file)
    309303  endif
    310304$(EXPORT_CLIENT_DIR)/%.map:  $(C1_DIR)/%.map
     
    317311$(EXPORT_SERVER_DIR)/%.pdb:  $(C2_DIR)/%.pdb
    318312        $(install-file)
    319   else
    320 $(EXPORT_SERVER_DIR)/%.sym:  $(C2_DIR)/%.sym
    321         $(install-file)
    322313  endif
    323314$(EXPORT_SERVER_DIR)/%.map:  $(C2_DIR)/%.map
     
    329320  ifneq ($(OSNAME),os2)
    330321$(EXPORT_KERNEL_DIR)/%.pdb:  $(KERNEL_DIR)/%.pdb
    331         $(install-file)
    332   else
    333 $(EXPORT_KERNEL_DIR)/%.sym:  $(KERNEL_DIR)/%.sym
    334322        $(install-file)
    335323  endif
  • trunk/openjdk/hotspot/make/os2/makefiles/compile.make

    r333 r448  
    8888ifeq ($(EMXOMFLD_TYPE), WLINK)
    8989  LINK_FLAGS += -Zlinker "DISABLE 1121"
    90   MAPSYM = wmapsym.cmd
    9190endif
    9291ifeq ($(EMXOMFLD_TYPE), VAC308)
    9392  LINK_FLAGS += -Zlinker /OPTFUNC
    94   MAPSYM = mapsym.exe
    9593endif
    9694 
  • trunk/openjdk/hotspot/make/os2/makefiles/debug.make

    r327 r448  
    5959        $(LINK) $(LINK_FLAGS) -o $@ $(Def_File) $(Obj_Files) $(Res_Files)
    6060        $(IMPLIB) -o $(basename $@).lib $@
    61         cd $(@D) && $(MAPSYM) $(basename $(@F)).map
    6261
    6362include $(WorkSpace)/make/os2/makefiles/shared.make
  • trunk/openjdk/hotspot/make/os2/makefiles/defs.make

    r337 r448  
    9191EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll
    9292EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
    93 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.sym
    9493endif
    9594
     
    10099EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll
    101100EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
    102 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.sym
    103101
    104102ifndef BUILD_CLIENT_ONLY
     
    108106EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll
    109107EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
    110 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.sym
    111108endif
    112109
     
    114111  EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/saos2dbg.dll
    115112  EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/saos2dbg.map
    116   EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/saos2dbg.sym
    117113  EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
    118114  # Must pass this down to make.
  • trunk/openjdk/hotspot/make/os2/makefiles/product.make

    r327 r448  
    6161        $(LINK) $(LINK_FLAGS) -o $@ $(Def_File) $(Obj_Files) $(Res_Files)
    6262        $(IMPLIB) -o $(basename $@).lib $@
    63         cd $(@D) && $(MAPSYM) $(basename $(@F)).map
    6463
    6564include $(WorkSpace)/make/os2/makefiles/shared.make
  • trunk/openjdk/jdk/make/common/Library.gmk

    r278 r448  
    229229        $(LINK) $(LDFLAGS) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS) $(DEF_FILE)
    230230        $(IMPLIB) -o $(OBJDIR)/$(LIBRARY).lib $@
    231         cd $(@D) && $(MAPSYM) $(basename $(@F)).map
    232231endif # LIBRARY
    233232
  • trunk/openjdk/jdk/make/common/Program.gmk

    r278 r448  
    171171            $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
    172172        $(LINK) $(LDFLAGS) -Zstack 0x2000 -o $@ $(FILES_o) $(LDLIBS)
    173         cd $(@D) && $(MAPSYM) $(basename $(@F)).map
    174173
    175174else # PLATFORM == os2
     
    219218        $(RM) $(OBJDIR)/$(PROGRAM).lib
    220219        $(RM) $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
    221         $(RM) *.sym
    222220endif
    223221
  • trunk/openjdk/jdk/make/common/shared/Compiler-gcc.gmk

    r406 r448  
    6767  AR           = $(COMPILER_PATH)emxomfar
    6868  IMPLIB       = $(COMPILER_PATH)emximp
    69 
    70   ifeq ($(EMXOMFLD_TYPE), WLINK)
    71     MAPSYM = wmapsym.cmd
    72   endif
    73   ifeq ($(EMXOMFLD_TYPE), VAC308)
    74     MAPSYM = mapsym.exe
    75   endif
    7669
    7770  # Option used to create a shared library
  • trunk/openjdk/jdk/make/java/java/Makefile

    r447 r448  
    337337
    338338#
    339 # On OS/2, save .MAP and .SYM files for JAVA.DLL under a different
     339# On OS/2, save .MAP files for JAVA.DLL under a different
    340340# name since they clash with those from JAVA.EXE built later
    341341#
    342342ifeq ($(PLATFORM), os2)
    343 build: $(BINDIR)/$(LIBRARY).dll.map $(BINDIR)/$(LIBRARY).dll.sym
     343build: $(BINDIR)/$(LIBRARY).dll.map
    344344$(BINDIR)/$(LIBRARY).dll.map: $(BINDIR)/$(LIBRARY).map
    345         $(CP) $^ $@
    346 $(BINDIR)/$(LIBRARY).dll.sym: $(BINDIR)/$(LIBRARY).sym
    347345        $(CP) $^ $@
    348346endif
  • trunk/openjdk/jdk/make/java/redist/Makefile

    r337 r448  
    5454JVMMAP_NAME            = $(LIB_PREFIX)jvm.map
    5555JVMPDB_NAME            = $(LIB_PREFIX)jvm.pdb
    56 JVMSYM_NAME            = $(LIB_PREFIX)jvm.sym
    5756LIBJSIG_NAME           = $(LIB_PREFIX)jsig.$(LIBRARY_SUFFIX)
    5857JVMDB_NAME             = $(LIB_PREFIX)jvm$(DB_SUFFIX).$(LIBRARY_SUFFIX)
     
    160159#  OS/2        vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  OS/2
    161160
    162 # Get the hotspot .map and .sym files for client and server
     161# Get the hotspot .map files for client and server
    163162IMPORT_LIST += \
    164163        $(LIBDIR)/$(JVMLIB_NAME)
     
    166165ifndef BUILD_CLIENT_ONLY
    167166IMPORT_LIST += \
    168         $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
    169         $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMSYM_NAME)
     167        $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME)
    170168endif
    171169
    172170# Hotspot client is only available on 32-bit builds
    173171ifeq ($(ARCH_DATA_MODEL), 32)
    174   IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \
    175                  $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMSYM_NAME)
     172  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME)
    176173endif
    177174
     
    183180
    184181$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME)
    185         $(install-import-file)
    186 
    187 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMSYM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMSYM_NAME)
    188         $(install-import-file)
    189 
    190 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMSYM_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMSYM_NAME)
    191182        $(install-import-file)
    192183
Note: See TracChangeset for help on using the changeset viewer.