Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
Merge
Wed, 20 Jun 2012 14:29:23 -0700
- author
- dcubed
- date
- Wed, 20 Jun 2012 14:29:23 -0700
- changeset 3871
- 7de1d3b57419
- parent 3869
- 58ad5f22317e
- parent 3870
- d1b0644d6acf
- child 3872
- cfa2c82f4c04
Merge
| make/solaris/makefiles/defs.make | file | annotate | diff | comparison | revisions |
1.1 --- a/make/solaris/makefiles/add_gnu_debuglink.make Mon Jun 18 11:33:17 2012 +0200 1.2 +++ b/make/solaris/makefiles/add_gnu_debuglink.make Wed Jun 20 14:29:23 2012 -0700 1.3 @@ -24,8 +24,11 @@ 1.4 1.5 # Rules to build add_gnu_debuglink, used by vm.make on Solaris 1.6 1.7 -GENERATED = ../generated 1.8 -ADD_GNU_DEBUGLINK = $(GENERATED)/add_gnu_debuglink 1.9 +# Allow $(ADD_GNU_DEBUGLINK) to be called from any directory. 1.10 +# We don't set or use the GENERATED macro to avoid affecting 1.11 +# other HotSpot Makefiles. 1.12 +TOPDIR = $(shell echo `pwd`) 1.13 +ADD_GNU_DEBUGLINK = $(TOPDIR)/../generated/add_gnu_debuglink 1.14 1.15 ADD_GNU_DEBUGLINK_DIR = $(GAMMADIR)/src/os/solaris/add_gnu_debuglink 1.16 ADD_GNU_DEBUGLINK_SRC = $(ADD_GNU_DEBUGLINK_DIR)/add_gnu_debuglink.c
2.1 --- a/make/solaris/makefiles/defs.make Mon Jun 18 11:33:17 2012 +0200 2.2 +++ b/make/solaris/makefiles/defs.make Wed Jun 20 14:29:23 2012 -0700 2.3 @@ -203,10 +203,18 @@ 2.4 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz 2.5 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.diz 2.6 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.diz 2.7 + ifeq ($(ARCH_DATA_MODEL),32) 2.8 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.diz 2.9 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.diz 2.10 + endif 2.11 else 2.12 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo 2.13 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo 2.14 EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.debuginfo 2.15 + ifeq ($(ARCH_DATA_MODEL),32) 2.16 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.debuginfo 2.17 + EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.debuginfo 2.18 + endif 2.19 endif 2.20 endif 2.21 endif
3.1 --- a/make/solaris/makefiles/dtrace.make Mon Jun 18 11:33:17 2012 +0200 3.2 +++ b/make/solaris/makefiles/dtrace.make Wed Jun 20 14:29:23 2012 -0700 3.3 @@ -94,23 +94,24 @@ 3.4 # Making 64/libjvm_db.so: 64-bit version of libjvm_db.so which handles 32-bit libjvm.so 3.5 ifneq ("${ISA}","${BUILDARCH}") 3.6 3.7 -XLIBJVM_DB = 64/$(LIBJVM_DB) 3.8 -XLIBJVM_DB_G = 64/$(LIBJVM_DB_G) 3.9 -XLIBJVM_DTRACE = 64/$(LIBJVM_DTRACE) 3.10 -XLIBJVM_DTRACE_G = 64/$(LIBJVM_DTRACE_G) 3.11 +XLIBJVM_DIR = 64 3.12 +XLIBJVM_DB = $(XLIBJVM_DIR)/$(LIBJVM_DB) 3.13 +XLIBJVM_DB_G = $(XLIBJVM_DIR)/$(LIBJVM_DB_G) 3.14 +XLIBJVM_DTRACE = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE) 3.15 +XLIBJVM_DTRACE_G = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_G) 3.16 3.17 -XLIBJVM_DB_DEBUGINFO = 64/$(LIBJVM_DB_DEBUGINFO) 3.18 -XLIBJVM_DB_DIZ = 64/$(LIBJVM_DB_DIZ) 3.19 -XLIBJVM_DB_G_DEBUGINFO = 64/$(LIBJVM_DB_G_DEBUGINFO) 3.20 -XLIBJVM_DB_G_DIZ = 64/$(LIBJVM_DB_G_DIZ) 3.21 -XLIBJVM_DTRACE_DEBUGINFO = 64/$(LIBJVM_DTRACE_DEBUGINFO) 3.22 -XLIBJVM_DTRACE_DIZ = 64/$(LIBJVM_DTRACE_DIZ) 3.23 -XLIBJVM_DTRACE_G_DEBUGINFO = 64/$(LIBJVM_DTRACE_G_DEBUGINFO) 3.24 -XLIBJVM_DTRACE_G_DIZ = 64/$(LIBJVM_DTRACE_G_DIZ) 3.25 +XLIBJVM_DB_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DB_DEBUGINFO) 3.26 +XLIBJVM_DB_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DB_DIZ) 3.27 +XLIBJVM_DB_G_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DB_G_DEBUGINFO) 3.28 +XLIBJVM_DB_G_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DB_G_DIZ) 3.29 +XLIBJVM_DTRACE_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DEBUGINFO) 3.30 +XLIBJVM_DTRACE_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DIZ) 3.31 +XLIBJVM_DTRACE_G_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_G_DEBUGINFO) 3.32 +XLIBJVM_DTRACE_G_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_G_DIZ) 3.33 3.34 $(XLIBJVM_DB): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE) 3.35 @echo Making $@ 3.36 - $(QUIETLY) mkdir -p 64/ ; \ 3.37 + $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \ 3.38 $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \ 3.39 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc 3.40 [ -f $(XLIBJVM_DB_G) ] || { ln -s $(LIBJVM_DB) $(XLIBJVM_DB_G); } 3.41 @@ -124,8 +125,10 @@ 3.42 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DB_DEBUGINFO) 3.43 # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 3.44 # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. 3.45 -# $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DB_DEBUGINFO) $@ 3.46 - $(QUIETLY) $(ADD_GNU_DEBUGLINK) $(XLIBJVM_DB_DEBUGINFO) $@ 3.47 +# $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ; 3.48 +# Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not 3.49 +# in the link name: 3.50 + ( cd $(XLIBJVM_DIR) && $(ADD_GNU_DEBUGLINK) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB) ) 3.51 ifeq ($(STRIP_POLICY),all_strip) 3.52 $(QUIETLY) $(STRIP) $@ 3.53 else 3.54 @@ -136,7 +139,9 @@ 3.55 endif 3.56 [ -f $(XLIBJVM_DB_G_DEBUGINFO) ] || { ln -s $(XLIBJVM_DB_DEBUGINFO) $(XLIBJVM_DB_G_DEBUGINFO); } 3.57 ifeq ($(ZIP_DEBUGINFO_FILES),1) 3.58 - $(ZIPEXE) -q -y $(XLIBJVM_DB_DIZ) $(XLIBJVM_DB_DEBUGINFO) $(XLIBJVM_DB_G_DEBUGINFO) 3.59 +# Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not 3.60 +# in the archived name: 3.61 + ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB_G_DEBUGINFO) ) 3.62 $(RM) $(XLIBJVM_DB_DEBUGINFO) $(XLIBJVM_DB_G_DEBUGINFO) 3.63 [ -f $(XLIBJVM_DB_G_DIZ) ] || { ln -s $(XLIBJVM_DB_DIZ) $(XLIBJVM_DB_G_DIZ); } 3.64 endif 3.65 @@ -144,7 +149,7 @@ 3.66 3.67 $(XLIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE) 3.68 @echo Making $@ 3.69 - $(QUIETLY) mkdir -p 64/ ; \ 3.70 + $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \ 3.71 $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \ 3.72 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor 3.73 [ -f $(XLIBJVM_DTRACE_G) ] || { ln -s $(LIBJVM_DTRACE) $(XLIBJVM_DTRACE_G); } 3.74 @@ -153,8 +158,10 @@ 3.75 $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@ 3.76 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO) 3.77 # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 3.78 -# $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DTRACE_DEBUGINFO) $@ 3.79 - $(QUIETLY) $(ADD_GNU_DEBUGLINK) $(XLIBJVM_DTRACE_DEBUGINFO) $@ 3.80 +# $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE) ; 3.81 +# Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not 3.82 +# in the link name: 3.83 + ( cd $(XLIBJVM_DIR) && $(ADD_GNU_DEBUGLINK) $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE) ) 3.84 ifeq ($(STRIP_POLICY),all_strip) 3.85 $(QUIETLY) $(STRIP) $@ 3.86 else 3.87 @@ -165,7 +172,9 @@ 3.88 endif 3.89 [ -f $(XLIBJVM_DTRACE_G_DEBUGINFO) ] || { ln -s $(XLIBJVM_DTRACE_DEBUGINFO) $(XLIBJVM_DTRACE_G_DEBUGINFO); } 3.90 ifeq ($(ZIP_DEBUGINFO_FILES),1) 3.91 - $(ZIPEXE) -q -y $(XLIBJVM_DTRACE_DIZ) $(XLIBJVM_DTRACE_DEBUGINFO) $(XLIBJVM_DTRACE_G_DEBUGINFO) 3.92 +# Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not 3.93 +# in the archived name: 3.94 + ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE_G_DEBUGINFO) ) 3.95 $(RM) $(XLIBJVM_DTRACE_DEBUGINFO) $(XLIBJVM_DTRACE_G_DEBUGINFO) 3.96 [ -f $(XLIBJVM_DTRACE_G_DIZ) ] || { ln -s $(XLIBJVM_DTRACE_DIZ) $(XLIBJVM_DTRACE_G_DIZ); } 3.97 endif
4.1 --- a/make/solaris/makefiles/fix_empty_sec_hdr_flags.make Mon Jun 18 11:33:17 2012 +0200 4.2 +++ b/make/solaris/makefiles/fix_empty_sec_hdr_flags.make Wed Jun 20 14:29:23 2012 -0700 4.3 @@ -24,8 +24,11 @@ 4.4 4.5 # Rules to build fix_empty_sec_hdr_flags, used by vm.make on Solaris 4.6 4.7 -GENERATED = ../generated 4.8 -FIX_EMPTY_SEC_HDR_FLAGS = $(GENERATED)/fix_empty_sec_hdr_flags 4.9 +# Allow $(FIX_EMPTY_SEC_HDR_FLAGS) to be called from any directory. 4.10 +# We don't set or use the GENERATED macro to avoid affecting 4.11 +# other HotSpot Makefiles. 4.12 +TOPDIR = $(shell echo `pwd`) 4.13 +FIX_EMPTY_SEC_HDR_FLAGS = $(TOPDIR)/../generated/fix_empty_sec_hdr_flags 4.14 4.15 FIX_EMPTY_SEC_HDR_FLAGS_DIR = $(GAMMADIR)/src/os/solaris/fix_empty_sec_hdr_flags 4.16 FIX_EMPTY_SEC_HDR_FLAGS_SRC = $(FIX_EMPTY_SEC_HDR_FLAGS_DIR)/fix_empty_sec_hdr_flags.c
