Changeset 448 for trunk/openjdk/jdk

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/jdk/make

Files:

• common/Library.gmk (modified) (1 diff)
• common/Program.gmk (modified) (2 diffs)
• common/shared/Compiler-gcc.gmk (modified) (1 diff)
• java/java/Makefile (modified) (1 diff)
• java/redist/Makefile (modified) (4 diffs)

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

@@ -229 +229 @@
         $(LINK) $(LDFLAGS) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS) $(DEF_FILE)
         $(IMPLIB) -o $(OBJDIR)/$(LIBRARY).lib $@
-        cd $(@D) && $(MAPSYM) $(basename $(@F)).map
 endif # LIBRARY
 

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

@@ -171 +171 @@
             $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
         $(LINK) $(LDFLAGS) -Zstack 0x2000 -o $@ $(FILES_o) $(LDLIBS)
-        cd $(@D) && $(MAPSYM) $(basename $(@F)).map
 
 else # PLATFORM == os2
@@ -219 +218 @@
         $(RM) $(OBJDIR)/$(PROGRAM).lib
         $(RM) $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
-        $(RM) *.sym
 endif
 

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

@@ -67 +67 @@
   AR           = $(COMPILER_PATH)emxomfar
   IMPLIB       = $(COMPILER_PATH)emximp
-
-  ifeq ($(EMXOMFLD_TYPE), WLINK)
-    MAPSYM = wmapsym.cmd
-  endif
-  ifeq ($(EMXOMFLD_TYPE), VAC308)
-    MAPSYM = mapsym.exe
-  endif
 
   # Option used to create a shared library

trunk/openjdk/jdk/make/java/java/Makefile

@@ -337 +337 @@
 
 #
-# On OS/2, save .MAP and .SYM files for JAVA.DLL under a different
+# On OS/2, save .MAP files for JAVA.DLL under a different
 # name since they clash with those from JAVA.EXE built later
 #
 ifeq ($(PLATFORM), os2)
-build: $(BINDIR)/$(LIBRARY).dll.map $(BINDIR)/$(LIBRARY).dll.sym
+build: $(BINDIR)/$(LIBRARY).dll.map
 $(BINDIR)/$(LIBRARY).dll.map: $(BINDIR)/$(LIBRARY).map
-        $(CP) $^ $@
-$(BINDIR)/$(LIBRARY).dll.sym: $(BINDIR)/$(LIBRARY).sym
         $(CP) $^ $@
 endif

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

@@ -54 +54 @@
 JVMMAP_NAME            = $(LIB_PREFIX)jvm.map
 JVMPDB_NAME            = $(LIB_PREFIX)jvm.pdb
-JVMSYM_NAME            = $(LIB_PREFIX)jvm.sym
 LIBJSIG_NAME           = $(LIB_PREFIX)jsig.$(LIBRARY_SUFFIX)
 JVMDB_NAME             = $(LIB_PREFIX)jvm$(DB_SUFFIX).$(LIBRARY_SUFFIX)
@@ -160 +159 @@
 #  OS/2        vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  OS/2
 
-# Get the hotspot .map and .sym files for client and server
+# Get the hotspot .map files for client and server
 IMPORT_LIST += \
         $(LIBDIR)/$(JVMLIB_NAME)
@@ -166 +165 @@
 ifndef BUILD_CLIENT_ONLY
 IMPORT_LIST += \
-        $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \
-        $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMSYM_NAME)
+        $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME)
 endif
 
 # Hotspot client is only available on 32-bit builds
 ifeq ($(ARCH_DATA_MODEL), 32)
-  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME) \
-                 $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMSYM_NAME)
+  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME)
 endif
 
@@ -183 +180 @@
 
 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME)
-        $(install-import-file)
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMSYM_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMSYM_NAME)
-        $(install-import-file)
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMSYM_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMSYM_NAME)
         $(install-import-file)