Changeset 245 for trunk/openjdk/jdk

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

Files:

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

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

@@ -249 +249 @@
         $(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

@@ -175 +175 @@
 ifeq ($(PLATFORM), os2)
 
-$(ACTUAL_PROGRAM):: $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
-        @$(install-file)
-
-$(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(FILES_o)
+$(ACTUAL_PROGRAM):: $(FILES_o)
         @$(prep-target)
         @set -- $?; \
             $(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

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

@@ -72 +72 @@
   AR           = $(COMPILER_PATH)emxomfar
   IMPLIB       = $(COMPILER_PATH)emximp
+  MAPSYM       = mapsym.exe
 
   # Option used to create a shared library

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

@@ -173 +173 @@
         $(install-import-file)
 
-# it is OK for the .map and .sym files to not exist, so do not force a
-# dependency on them from the bootstrap location, and allow the copy to fail.
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME):
-        @$(prep-target)
-        -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME)  $@
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME):
-        @$(prep-target)
-        -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMMAP_NAME) $@
-
-$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMSYM_NAME):
-        @$(prep-target)
-        -$(CP) $(HOTSPOT_CLIENT_PATH)/$(JVMSYM_NAME)  $@
-
-$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMSYM_NAME):
-        @$(prep-target)
-        -$(CP) $(HOTSPOT_SERVER_PATH)/$(JVMSYM_NAME) $@
+$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMMAP_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMMAP_NAME)
+        $(install-import-file)
+
+$(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)
 
 #  OS/2        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  OS/2