comparison make/solaris/makefiles/dtrace.make @ 7482:989155e2d07a

Merge with hs25-b15.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Jan 2013 01:34:24 +0100
parents 892acf0431ef
children 8b46b0196eb0
comparison
equal deleted inserted replaced
7381:6761a8f854a4 7482:989155e2d07a
37 37
38 else 38 else
39 39
40 JVM_DB = libjvm_db 40 JVM_DB = libjvm_db
41 LIBJVM_DB = libjvm_db.so 41 LIBJVM_DB = libjvm_db.so
42 LIBJVM_DB_G = libjvm$(G_SUFFIX)_db.so
43 42
44 LIBJVM_DB_DEBUGINFO = libjvm_db.debuginfo 43 LIBJVM_DB_DEBUGINFO = libjvm_db.debuginfo
45 LIBJVM_DB_DIZ = libjvm_db.diz 44 LIBJVM_DB_DIZ = libjvm_db.diz
46 LIBJVM_DB_G_DEBUGINFO = libjvm$(G_SUFFIX)_db.debuginfo
47 LIBJVM_DB_G_DIZ = libjvm$(G_SUFFIX)_db.diz
48 45
49 JVM_DTRACE = jvm_dtrace 46 JVM_DTRACE = jvm_dtrace
50 LIBJVM_DTRACE = libjvm_dtrace.so 47 LIBJVM_DTRACE = libjvm_dtrace.so
51 LIBJVM_DTRACE_G = libjvm$(G_SUFFIX)_dtrace.so
52 48
53 LIBJVM_DTRACE_DEBUGINFO = libjvm_dtrace.debuginfo 49 LIBJVM_DTRACE_DEBUGINFO = libjvm_dtrace.debuginfo
54 LIBJVM_DTRACE_DIZ = libjvm_dtrace.diz 50 LIBJVM_DTRACE_DIZ = libjvm_dtrace.diz
55 LIBJVM_DTRACE_G_DEBUGINFO = libjvm$(G_SUFFIX)_dtrace.debuginfo
56 LIBJVM_DTRACE_G_DIZ = libjvm$(G_SUFFIX)_dtrace.diz
57 51
58 JVMOFFS = JvmOffsets 52 JVMOFFS = JvmOffsets
59 JVMOFFS.o = $(JVMOFFS).o 53 JVMOFFS.o = $(JVMOFFS).o
60 GENOFFS = generate$(JVMOFFS) 54 GENOFFS = generate$(JVMOFFS)
61 55
94 # Making 64/libjvm_db.so: 64-bit version of libjvm_db.so which handles 32-bit libjvm.so 88 # Making 64/libjvm_db.so: 64-bit version of libjvm_db.so which handles 32-bit libjvm.so
95 ifneq ("${ISA}","${BUILDARCH}") 89 ifneq ("${ISA}","${BUILDARCH}")
96 90
97 XLIBJVM_DIR = 64 91 XLIBJVM_DIR = 64
98 XLIBJVM_DB = $(XLIBJVM_DIR)/$(LIBJVM_DB) 92 XLIBJVM_DB = $(XLIBJVM_DIR)/$(LIBJVM_DB)
99 XLIBJVM_DB_G = $(XLIBJVM_DIR)/$(LIBJVM_DB_G)
100 XLIBJVM_DTRACE = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE) 93 XLIBJVM_DTRACE = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE)
101 XLIBJVM_DTRACE_G = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_G)
102 94
103 XLIBJVM_DB_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DB_DEBUGINFO) 95 XLIBJVM_DB_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DB_DEBUGINFO)
104 XLIBJVM_DB_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DB_DIZ) 96 XLIBJVM_DB_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DB_DIZ)
105 XLIBJVM_DB_G_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DB_G_DEBUGINFO)
106 XLIBJVM_DB_G_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DB_G_DIZ)
107 XLIBJVM_DTRACE_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DEBUGINFO) 97 XLIBJVM_DTRACE_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DEBUGINFO)
108 XLIBJVM_DTRACE_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DIZ) 98 XLIBJVM_DTRACE_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_DIZ)
109 XLIBJVM_DTRACE_G_DEBUGINFO = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_G_DEBUGINFO)
110 XLIBJVM_DTRACE_G_DIZ = $(XLIBJVM_DIR)/$(LIBJVM_DTRACE_G_DIZ)
111 99
112 $(XLIBJVM_DB): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE) 100 $(XLIBJVM_DB): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
113 @echo Making $@ 101 @echo Making $@
114 $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \ 102 $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
115 $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \ 103 $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \
116 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc 104 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
117 [ -f $(XLIBJVM_DB_G) ] || { ln -s $(LIBJVM_DB) $(XLIBJVM_DB_G); }
118 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 105 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
119 # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. 106 # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
120 # Clear the SHF_ALLOC flag (if set) from empty section headers. 107 # Clear the SHF_ALLOC flag (if set) from empty section headers.
121 # An empty section header has sh_addr == 0 and sh_size == 0. 108 # An empty section header has sh_addr == 0 and sh_size == 0.
122 # This problem has only been seen on Solaris X64, but we call this tool 109 # This problem has only been seen on Solaris X64, but we call this tool
135 ifeq ($(STRIP_POLICY),min_strip) 122 ifeq ($(STRIP_POLICY),min_strip)
136 $(QUIETLY) $(STRIP) -x $@ 123 $(QUIETLY) $(STRIP) -x $@
137 # implied else here is no stripping at all 124 # implied else here is no stripping at all
138 endif 125 endif
139 endif 126 endif
140 [ -f $(XLIBJVM_DB_G_DEBUGINFO) ] || { cd $(XLIBJVM_DIR) && ln -s $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB_G_DEBUGINFO); }
141 ifeq ($(ZIP_DEBUGINFO_FILES),1) 127 ifeq ($(ZIP_DEBUGINFO_FILES),1)
142 # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not 128 # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not
143 # in the archived name: 129 # in the archived name:
144 ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB_G_DEBUGINFO) ) 130 ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO) )
145 $(RM) $(XLIBJVM_DB_DEBUGINFO) $(XLIBJVM_DB_G_DEBUGINFO) 131 $(RM) $(XLIBJVM_DB_DEBUGINFO)
146 [ -f $(XLIBJVM_DB_G_DIZ) ] || { cd $(XLIBJVM_DIR) && ln -s $(LIBJVM_DB_DIZ) $(LIBJVM_DB_G_DIZ); }
147 endif 132 endif
148 endif 133 endif
149 134
150 $(XLIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE) 135 $(XLIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
151 @echo Making $@ 136 @echo Making $@
152 $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \ 137 $(QUIETLY) mkdir -p $(XLIBJVM_DIR) ; \
153 $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \ 138 $(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \
154 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor 139 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
155 [ -f $(XLIBJVM_DTRACE_G) ] || { ln -s $(LIBJVM_DTRACE) $(XLIBJVM_DTRACE_G); }
156 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 140 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
157 # Clear the SHF_ALLOC flag (if set) from empty section headers. 141 # Clear the SHF_ALLOC flag (if set) from empty section headers.
158 $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@ 142 $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
159 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO) 143 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO)
160 # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 144 # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
168 ifeq ($(STRIP_POLICY),min_strip) 152 ifeq ($(STRIP_POLICY),min_strip)
169 $(QUIETLY) $(STRIP) -x $@ 153 $(QUIETLY) $(STRIP) -x $@
170 # implied else here is no stripping at all 154 # implied else here is no stripping at all
171 endif 155 endif
172 endif 156 endif
173 [ -f $(XLIBJVM_DTRACE_G_DEBUGINFO) ] || { cd $(XLIBJVM_DIR) && ln -s $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE_G_DEBUGINFO); }
174 ifeq ($(ZIP_DEBUGINFO_FILES),1) 157 ifeq ($(ZIP_DEBUGINFO_FILES),1)
175 # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not 158 # Do this part in the $(XLIBJVM_DIR) subdir so $(XLIBJVM_DIR) is not
176 # in the archived name: 159 # in the archived name:
177 ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE_G_DEBUGINFO) ) 160 ( cd $(XLIBJVM_DIR) && $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO))
178 $(RM) $(XLIBJVM_DTRACE_DEBUGINFO) $(XLIBJVM_DTRACE_G_DEBUGINFO) 161 $(RM) $(XLIBJVM_DTRACE_DEBUGINFO)
179 [ -f $(XLIBJVM_DTRACE_G_DIZ) ] || { cd $(XLIBJVM_DIR) && ln -s $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_G_DIZ); }
180 endif 162 endif
181 endif 163 endif
182 164
183 endif # ifneq ("${ISA}","${BUILDARCH}") 165 endif # ifneq ("${ISA}","${BUILDARCH}")
184 166
222 204
223 $(LIBJVM_DB): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE) 205 $(LIBJVM_DB): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
224 @echo Making $@ 206 @echo Making $@
225 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \ 207 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
226 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc 208 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
227 [ -f $(LIBJVM_DB_G) ] || { ln -s $@ $(LIBJVM_DB_G); }
228 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 209 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
229 # Clear the SHF_ALLOC flag (if set) from empty section headers. 210 # Clear the SHF_ALLOC flag (if set) from empty section headers.
230 $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@ 211 $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
231 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DB_DEBUGINFO) 212 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DB_DEBUGINFO)
232 # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 213 # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
238 ifeq ($(STRIP_POLICY),min_strip) 219 ifeq ($(STRIP_POLICY),min_strip)
239 $(QUIETLY) $(STRIP) -x $@ 220 $(QUIETLY) $(STRIP) -x $@
240 # implied else here is no stripping at all 221 # implied else here is no stripping at all
241 endif 222 endif
242 endif 223 endif
243 [ -f $(LIBJVM_DB_G_DEBUGINFO) ] || { ln -s $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB_G_DEBUGINFO); }
244 ifeq ($(ZIP_DEBUGINFO_FILES),1) 224 ifeq ($(ZIP_DEBUGINFO_FILES),1)
245 $(ZIPEXE) -q -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB_G_DEBUGINFO) 225 $(ZIPEXE) -q -y $(LIBJVM_DB_DIZ) $(LIBJVM_DB_DEBUGINFO)
246 $(RM) $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB_G_DEBUGINFO) 226 $(RM) $(LIBJVM_DB_DEBUGINFO)
247 [ -f $(LIBJVM_DB_G_DIZ) ] || { ln -s $(LIBJVM_DB_DIZ) $(LIBJVM_DB_G_DIZ); }
248 endif 227 endif
249 endif 228 endif
250 229
251 $(LIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE) 230 $(LIBJVM_DTRACE): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
252 @echo Making $@ 231 @echo Making $@
253 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \ 232 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \
254 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor 233 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
255 [ -f $(LIBJVM_DTRACE_G) ] || { ln -s $@ $(LIBJVM_DTRACE_G); }
256 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) 234 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
257 # Clear the SHF_ALLOC flag (if set) from empty section headers. 235 # Clear the SHF_ALLOC flag (if set) from empty section headers.
258 $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@ 236 $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
259 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO) 237 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO)
260 # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 238 # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
266 ifeq ($(STRIP_POLICY),min_strip) 244 ifeq ($(STRIP_POLICY),min_strip)
267 $(QUIETLY) $(STRIP) -x $@ 245 $(QUIETLY) $(STRIP) -x $@
268 # implied else here is no stripping at all 246 # implied else here is no stripping at all
269 endif 247 endif
270 endif 248 endif
271 [ -f $(LIBJVM_DTRACE_G_DEBUGINFO) ] || { ln -s $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE_G_DEBUGINFO); }
272 ifeq ($(ZIP_DEBUGINFO_FILES),1) 249 ifeq ($(ZIP_DEBUGINFO_FILES),1)
273 $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE_G_DEBUGINFO) 250 $(ZIPEXE) -q -y $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_DEBUGINFO)
274 $(RM) $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE_G_DEBUGINFO) 251 $(RM) $(LIBJVM_DTRACE_DEBUGINFO)
275 [ -f $(LIBJVM_DTRACE_G_DIZ) ] || { ln -s $(LIBJVM_DTRACE_DIZ) $(LIBJVM_DTRACE_G_DIZ); }
276 endif 252 endif
277 endif 253 endif
278 254
279 $(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \ 255 $(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \
280 $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d 256 $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d