Print this page
rev 416 : 6769128: failure to run generateJvmOffsets is ignored
Reviewed-by:
| Split |
Split |
Close |
| Expand all |
| Collapse all |
--- old/make/solaris/makefiles/dtrace.make
+++ new/make/solaris/makefiles/dtrace.make
1 1 #
2 2 # Copyright 2005-2008 Sun Microsystems, Inc. All Rights Reserved.
3 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 #
5 5 # This code is free software; you can redistribute it and/or modify it
6 6 # under the terms of the GNU General Public License version 2 only, as
7 7 # published by the Free Software Foundation.
8 8 #
9 9 # This code is distributed in the hope that it will be useful, but WITHOUT
10 10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 # version 2 for more details (a copy is included in the LICENSE file that
13 13 # accompanied this code).
14 14 #
15 15 # You should have received a copy of the GNU General Public License version
16 16 # 2 along with this work; if not, write to the Free Software Foundation,
17 17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 #
19 19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
20 20 # CA 95054 USA or visit www.sun.com if you need additional information or
21 21 # have any questions.
22 22 #
23 23 #
24 24
25 25 # Rules to build jvm_db/dtrace, used by vm.make
26 26
27 27 # we build libjvm_dtrace/libjvm_db/dtrace for COMPILER1 and COMPILER2
28 28 # but not for CORE configuration
29 29
30 30 ifneq ("${TYPE}", "CORE")
31 31 ifneq ("${TYPE}", "KERNEL")
32 32
33 33 ifdef USE_GCC
34 34
35 35 dtraceCheck:
36 36 $(QUIETLY) echo "**NOTICE** Dtrace support disabled for gcc builds"
37 37
38 38 else
39 39
40 40
41 41 JVM_DB = libjvm_db
42 42 LIBJVM_DB = libjvm$(G_SUFFIX)_db.so
43 43
44 44 JVM_DTRACE = jvm_dtrace
45 45 LIBJVM_DTRACE = libjvm$(G_SUFFIX)_dtrace.so
46 46
47 47 JVMOFFS = JvmOffsets
48 48 JVMOFFS.o = $(JVMOFFS).o
49 49 GENOFFS = generate$(JVMOFFS)
50 50
51 51 DTRACE_SRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/dtrace
52 52 DTRACE = dtrace
53 53 DTRACE.o = $(DTRACE).o
54 54
55 55 # to remove '-g' option which causes link problems
56 56 # also '-z nodefs' is used as workaround
57 57 GENOFFS_CFLAGS = $(shell echo $(CFLAGS) | sed -e 's/ -g / /g' -e 's/ -g0 / /g';)
58 58
59 59 ifdef LP64
60 60 DTRACE_OPTS = -64 -D_LP64
61 61 endif
62 62
63 63 # making libjvm_db
64 64
65 65 INCLS = $(GENERATED)/incls
66 66
67 67 # Use mapfile with libjvm_db.so
68 68 LIBJVM_DB_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jvm_db
69 69 LFLAGS_JVM_DB += $(MAPFLAG:FILENAME=$(LIBJVM_DB_MAPFILE))
70 70
71 71 # Use mapfile with libjvm_dtrace.so
72 72 LIBJVM_DTRACE_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jvm_dtrace
73 73 LFLAGS_JVM_DTRACE += $(MAPFLAG:FILENAME=$(LIBJVM_DTRACE_MAPFILE))
74 74
75 75 ifdef USE_GCC
76 76 LFLAGS_JVM_DB += -D_REENTRANT $(PICFLAG)
77 77 LFLAGS_JVM_DTRACE += -D_REENTRANT $(PICFLAG)
78 78 else
79 79 LFLAGS_JVM_DB += -mt $(PICFLAG) -xnolib
80 80 LFLAGS_JVM_DTRACE += -mt $(PICFLAG) -xnolib
81 81 endif
82 82
83 83 ISA = $(subst i386,i486,$(shell isainfo -n))
84 84
85 85 # Making 64/libjvm_db.so: 64-bit version of libjvm_db.so which handles 32-bit libjvm.so
86 86 ifneq ("${ISA}","${BUILDARCH}")
87 87
88 88 XLIBJVM_DB = 64/$(LIBJVM_DB)
89 89 XLIBJVM_DTRACE = 64/$(LIBJVM_DTRACE)
90 90 XARCH = $(subst sparcv9,v9,$(shell echo $(ISA)))
91 91
92 92 $(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
93 93 @echo Making $@
94 94 $(QUIETLY) mkdir -p 64/ ; \
95 95 $(CC) $(SYMFLAG) $(ARCHFLAG/$(XARCH)) -D$(TYPE) -I. -I$(GENERATED) \
96 96 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
97 97 $(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
98 98 @echo Making $@
99 99 $(QUIETLY) mkdir -p 64/ ; \
100 100 $(CC) $(SYMFLAG) $(ARCHFLAG/$(XARCH)) -D$(TYPE) -I. \
101 101 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
102 102 endif # ifneq ("${ISA}","${BUILDARCH}")
103 103
104 104 ifdef USE_GCC
105 105 LFLAGS_GENOFFS += -D_REENTRANT
106 106 else
107 107 LFLAGS_GENOFFS += -mt -xnolib -norunpath
108 108 endif
|
↓ open down ↓ |
108 lines elided |
↑ open up ↑ |
109 109
110 110 lib$(GENOFFS).so: $(DTRACE_SRCDIR)/$(GENOFFS).cpp $(DTRACE_SRCDIR)/$(GENOFFS).h \
111 111 $(INCLS)/_vmStructs.cpp.incl $(LIBJVM.o)
112 112 $(QUIETLY) $(CCC) $(CPPFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \
113 113 $(LFLAGS_GENOFFS) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS).cpp -lc
114 114
115 115 $(GENOFFS): $(DTRACE_SRCDIR)/$(GENOFFS)Main.c lib$(GENOFFS).so
116 116 $(QUIETLY) $(LINK.CC) -z nodefs -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
117 117 ./lib$(GENOFFS).so
118 118
119 -# $@.tmp is created first. It's to avoid empty $(JVMOFFS).h produced in error case.
119 +CONDITIONALLY_UPDATE_JVMOFFS_TARGET = \
120 + cmp -s $@ $@.tmp; \
121 + case $$? in \
122 + 0) rm -f $@.tmp;; \
123 + *) rm -f $@ && mv $@.tmp $@ && echo Updated $@;; \
124 + esac
125 +
126 +# $@.tmp is created first to avoid an empty $(JVMOFFS).h if an error occurs.
120 127 $(JVMOFFS).h: $(GENOFFS)
121 - $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -header > $@.tmp ; \
122 - if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
123 - then rm -f $@; mv $@.tmp $@; echo Updated $@ ; \
124 - else rm -f $@.tmp; \
125 - fi
128 + $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -header > $@.tmp
129 + $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET)
126 130
127 131 $(JVMOFFS)Index.h: $(GENOFFS)
128 - $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -index > $@.tmp ; \
129 - if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
130 - then rm -f $@; mv $@.tmp $@; echo Updated $@ ; \
131 - else rm -f $@.tmp; \
132 - fi
132 + $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -index > $@.tmp
133 + $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET)
133 134
134 135 $(JVMOFFS).cpp: $(GENOFFS) $(JVMOFFS).h $(JVMOFFS)Index.h
135 - $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -table > $@.tmp ; \
136 - if [ `diff $@.tmp $@ > /dev/null 2>&1; echo $$?` -ne 0 ] ; \
137 - then rm -f $@; mv $@.tmp $@; echo Updated $@ ; \
138 - else rm -f $@.tmp; \
139 - fi
136 + $(QUIETLY) LD_LIBRARY_PATH=. ./$(GENOFFS) -table > $@.tmp
137 + $(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET)
140 138
141 139 $(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp
142 140 $(QUIETLY) $(CCC) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
143 141
144 142 $(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
145 143 @echo Making $@
146 144 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
147 145 $(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
148 146
149 147 $(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
150 148 @echo Making $@
151 149 $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \
152 150 $(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
153 151
154 152 $(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \
155 153 $(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d
156 154 $(QUIETLY) cat $^ > $@
157 155
158 156 # Dtrace is available, so we build $(DTRACE.o)
159 157 $(DTRACE.o): $(DTRACE).d $(JVMOFFS).h $(JVMOFFS)Index.h $(DTraced_Files)
160 158 @echo Compiling $(DTRACE).d
161 159
162 160 $(QUIETLY) $(DTRACE_PROG) $(DTRACE_OPTS) -C -I. -G -o $@ -s $(DTRACE).d \
163 161 $(DTraced_Files) ||\
164 162 STATUS=$$?;\
165 163 if [ x"$$STATUS" = x"1" -a \
166 164 x`uname -r` = x"5.10" -a \
167 165 x`uname -p` = x"sparc" ]; then\
168 166 echo "*****************************************************************";\
169 167 echo "* If you are building server compiler, and the error message is ";\
170 168 echo "* \"incorrect ELF machine type...\", you have run into solaris bug ";\
171 169 echo "* 6213962, \"dtrace -G doesn't work on sparcv8+ object files\".";\
172 170 echo "* Either patch/upgrade your system (>= S10u1_15), or set the ";\
173 171 echo "* environment variable HOTSPOT_DISABLE_DTRACE_PROBES to disable ";\
174 172 echo "* dtrace probes for this build.";\
175 173 echo "*****************************************************************";\
176 174 fi;\
177 175 exit $$STATUS
178 176 # Since some DTraced_Files are in LIBJVM.o and they are touched by this
179 177 # command, and libgenerateJvmOffsets.so depends on LIBJVM.o, 'make' will
180 178 # think it needs to rebuild libgenerateJvmOffsets.so and thus JvmOffsets*
181 179 # files, but it doesn't, so we touch the necessary files to prevent later
182 180 # recompilation. Note: we only touch the necessary files if they already
183 181 # exist in order to close a race where an empty file can be created
184 182 # before the real build rule is executed.
185 183 # But, we can't touch the *.h files: This rule depends
186 184 # on them, and that would cause an infinite cycle of rebuilding.
187 185 # Neither the *.h or *.ccp files need to be touched, since they have
188 186 # rules which do not update them when the generator file has not
189 187 # changed their contents.
190 188 $(QUIETLY) if [ -f lib$(GENOFFS).so ]; then touch lib$(GENOFFS).so; fi
191 189 $(QUIETLY) if [ -f $(GENOFFS) ]; then touch $(GENOFFS); fi
192 190 $(QUIETLY) if [ -f $(JVMOFFS.o) ]; then touch $(JVMOFFS.o); fi
193 191
194 192 .PHONY: dtraceCheck
195 193
196 194 SYSTEM_DTRACE_H = /usr/include/dtrace.h
197 195 SYSTEM_DTRACE_PROG = /usr/sbin/dtrace
198 196 PATCH_DTRACE_PROG = /opt/SUNWdtrd/sbin/dtrace
199 197 systemDtraceFound := $(wildcard ${SYSTEM_DTRACE_PROG})
200 198 patchDtraceFound := $(wildcard ${PATCH_DTRACE_PROG})
201 199 systemDtraceHdrFound := $(wildcard $(SYSTEM_DTRACE_H))
202 200
203 201 ifneq ("$(systemDtraceHdrFound)", "")
204 202 CFLAGS += -DHAVE_DTRACE_H
205 203 endif
206 204
207 205 ifneq ("$(patchDtraceFound)", "")
208 206 DTRACE_PROG=$(PATCH_DTRACE_PROG)
209 207 DTRACE_INCL=-I/opt/SUNWdtrd/include
210 208 else
211 209 ifneq ("$(systemDtraceFound)", "")
212 210 DTRACE_PROG=$(SYSTEM_DTRACE_PROG)
213 211 else
214 212
215 213 endif # ifneq ("$(systemDtraceFound)", "")
216 214 endif # ifneq ("$(patchDtraceFound)", "")
217 215
218 216 ifneq ("${DTRACE_PROG}", "")
219 217 ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
220 218
221 219 DTRACE_OBJS = $(DTRACE.o) $(JVMOFFS.o)
222 220 CFLAGS += $(DTRACE_INCL) -DDTRACE_ENABLED
223 221 MAPFILE_DTRACE_OPT = $(MAPFILE_DTRACE)
224 222
225 223 dtraceCheck:
226 224
227 225 else # manually disabled
228 226
229 227 dtraceCheck:
230 228 $(QUIETLY) echo "**NOTICE** Dtrace support disabled via environment variable"
231 229
232 230 endif # ifeq ("${HOTSPOT_DISABLE_DTRACE_PROBES}", "")
233 231
234 232 else # No dtrace program found
235 233
236 234 dtraceCheck:
237 235 $(QUIETLY) echo "**NOTICE** Dtrace support disabled: not supported by system"
238 236
239 237 endif # ifneq ("${dtraceFound}", "")
240 238
241 239 endif # ifdef USE_GCC
242 240
243 241 else # KERNEL build
244 242
245 243 dtraceCheck:
246 244 $(QUIETLY) echo "**NOTICE** Dtrace support disabled for KERNEL builds"
247 245
248 246 endif # ifneq ("${TYPE}", "KERNEL")
249 247
250 248 else # CORE build
251 249
252 250 dtraceCheck:
253 251 $(QUIETLY) echo "**NOTICE** Dtrace support disabled for CORE builds"
254 252
255 253 endif # ifneq ("${TYPE}", "CORE")
|
↓ open down ↓ |
106 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX