Changeset 448
- Timestamp:
- Aug 27, 2016, 10:15:50 PM (9 years ago)
- Location:
- trunk/openjdk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/openjdk/corba/make/common/Library.gmk
r278 r448 208 208 $(LINK) $(LDFLAGS) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS) $(DEF_FILE) 209 209 $(IMPLIB) -o $(OBJDIR)/$(LIBRARY).lib $@ 210 cd $(@D) && $(MAPSYM) $(basename $(@F)).map211 210 212 211 # -
trunk/openjdk/corba/make/common/shared/Compiler-gcc.gmk
r331 r448 67 67 AR = $(COMPILER_PATH)emxomfar 68 68 IMPLIB = $(COMPILER_PATH)emximp 69 MAPSYM = mapsym.exe70 69 71 70 # Option used to create a shared library -
trunk/openjdk/hotspot/make/Makefile
r278 r448 291 291 $(EXPORT_JRE_BIN_DIR)/%.pdb: $(MISC_DIR)/%.pdb 292 292 $(install-file) 293 else294 $(EXPORT_JRE_BIN_DIR)/%.sym: $(MISC_DIR)/%.sym295 $(install-file)296 293 endif 297 294 $(EXPORT_JRE_BIN_DIR)/%.map: $(MISC_DIR)/%.map … … 304 301 $(EXPORT_CLIENT_DIR)/%.pdb: $(C1_DIR)/%.pdb 305 302 $(install-file) 306 else307 $(EXPORT_CLIENT_DIR)/%.sym: $(C1_DIR)/%.sym308 $(install-file)309 303 endif 310 304 $(EXPORT_CLIENT_DIR)/%.map: $(C1_DIR)/%.map … … 317 311 $(EXPORT_SERVER_DIR)/%.pdb: $(C2_DIR)/%.pdb 318 312 $(install-file) 319 else320 $(EXPORT_SERVER_DIR)/%.sym: $(C2_DIR)/%.sym321 $(install-file)322 313 endif 323 314 $(EXPORT_SERVER_DIR)/%.map: $(C2_DIR)/%.map … … 329 320 ifneq ($(OSNAME),os2) 330 321 $(EXPORT_KERNEL_DIR)/%.pdb: $(KERNEL_DIR)/%.pdb 331 $(install-file)332 else333 $(EXPORT_KERNEL_DIR)/%.sym: $(KERNEL_DIR)/%.sym334 322 $(install-file) 335 323 endif -
trunk/openjdk/hotspot/make/os2/makefiles/compile.make
r333 r448 88 88 ifeq ($(EMXOMFLD_TYPE), WLINK) 89 89 LINK_FLAGS += -Zlinker "DISABLE 1121" 90 MAPSYM = wmapsym.cmd91 90 endif 92 91 ifeq ($(EMXOMFLD_TYPE), VAC308) 93 92 LINK_FLAGS += -Zlinker /OPTFUNC 94 MAPSYM = mapsym.exe95 93 endif 96 94 -
trunk/openjdk/hotspot/make/os2/makefiles/debug.make
r327 r448 59 59 $(LINK) $(LINK_FLAGS) -o $@ $(Def_File) $(Obj_Files) $(Res_Files) 60 60 $(IMPLIB) -o $(basename $@).lib $@ 61 cd $(@D) && $(MAPSYM) $(basename $(@F)).map62 61 63 62 include $(WorkSpace)/make/os2/makefiles/shared.make -
trunk/openjdk/hotspot/make/os2/makefiles/defs.make
r337 r448 91 91 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll 92 92 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map 93 EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.sym94 93 endif 95 94 … … 100 99 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll 101 100 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map 102 EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.sym103 101 104 102 ifndef BUILD_CLIENT_ONLY … … 108 106 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll 109 107 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map 110 EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.sym111 108 endif 112 109 … … 114 111 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/saos2dbg.dll 115 112 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/saos2dbg.map 116 EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/saos2dbg.sym117 113 EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar 118 114 # Must pass this down to make. -
trunk/openjdk/hotspot/make/os2/makefiles/product.make
r327 r448 61 61 $(LINK) $(LINK_FLAGS) -o $@ $(Def_File) $(Obj_Files) $(Res_Files) 62 62 $(IMPLIB) -o $(basename $@).lib $@ 63 cd $(@D) && $(MAPSYM) $(basename $(@F)).map64 63 65 64 include $(WorkSpace)/make/os2/makefiles/shared.make -
trunk/openjdk/jdk/make/common/Library.gmk
r278 r448 229 229 $(LINK) $(LDFLAGS) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS) $(DEF_FILE) 230 230 $(IMPLIB) -o $(OBJDIR)/$(LIBRARY).lib $@ 231 cd $(@D) && $(MAPSYM) $(basename $(@F)).map232 231 endif # LIBRARY 233 232 -
trunk/openjdk/jdk/make/common/Program.gmk
r278 r448 171 171 $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...}; 172 172 $(LINK) $(LDFLAGS) -Zstack 0x2000 -o $@ $(FILES_o) $(LDLIBS) 173 cd $(@D) && $(MAPSYM) $(basename $(@F)).map174 173 175 174 else # PLATFORM == os2 … … 219 218 $(RM) $(OBJDIR)/$(PROGRAM).lib 220 219 $(RM) $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX) 221 $(RM) *.sym222 220 endif 223 221 -
trunk/openjdk/jdk/make/common/shared/Compiler-gcc.gmk
r406 r448 67 67 AR = $(COMPILER_PATH)emxomfar 68 68 IMPLIB = $(COMPILER_PATH)emximp 69 70 ifeq ($(EMXOMFLD_TYPE), WLINK)71 MAPSYM = wmapsym.cmd72 endif73 ifeq ($(EMXOMFLD_TYPE), VAC308)74 MAPSYM = mapsym.exe75 endif76 69 77 70 # Option used to create a shared library -
trunk/openjdk/jdk/make/java/java/Makefile
r447 r448 337 337 338 338 # 339 # On OS/2, save .MAP and .SYMfiles for JAVA.DLL under a different339 # On OS/2, save .MAP files for JAVA.DLL under a different 340 340 # name since they clash with those from JAVA.EXE built later 341 341 # 342 342 ifeq ($(PLATFORM), os2) 343 build: $(BINDIR)/$(LIBRARY).dll.map $(BINDIR)/$(LIBRARY).dll.sym343 build: $(BINDIR)/$(LIBRARY).dll.map 344 344 $(BINDIR)/$(LIBRARY).dll.map: $(BINDIR)/$(LIBRARY).map 345 $(CP) $^ $@346 $(BINDIR)/$(LIBRARY).dll.sym: $(BINDIR)/$(LIBRARY).sym347 345 $(CP) $^ $@ 348 346 endif -
trunk/openjdk/jdk/make/java/redist/Makefile
r337 r448 54 54 JVMMAP_NAME = $(LIB_PREFIX)jvm.map 55 55 JVMPDB_NAME = $(LIB_PREFIX)jvm.pdb 56 JVMSYM_NAME = $(LIB_PREFIX)jvm.sym57 56 LIBJSIG_NAME = $(LIB_PREFIX)jsig.$(LIBRARY_SUFFIX) 58 57 JVMDB_NAME = $(LIB_PREFIX)jvm$(DB_SUFFIX).$(LIBRARY_SUFFIX) … … 160 159 # OS/2 vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv OS/2 161 160 162 # Get the hotspot .map and .symfiles for client and server161 # Get the hotspot .map files for client and server 163 162 IMPORT_LIST += \ 164 163 $(LIBDIR)/$(JVMLIB_NAME) … … 166 165 ifndef BUILD_CLIENT_ONLY 167 166 IMPORT_LIST += \ 168 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) \ 169 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMSYM_NAME) 167 $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMMAP_NAME) 170 168 endif 171 169 172 170 # Hotspot client is only available on 32-bit builds 173 171 ifeq ($(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) 176 173 endif 177 174 … … 183 180 184 181 $(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)191 182 $(install-import-file) 192 183
Note:
See TracChangeset
for help on using the changeset viewer.