Print this page
rev 6896 : 8033602: wrong stabs data in libjvm.debuginfo on JDK 8 - SPARC
8034005: cannot debug in synchronizer.o or objectMonitor.o on Solaris X86
Summary: Solaris needs objcopy version of 2.21.1 or newer is needed to create valid .debuginfo files.
Reviewed-by: dsamersoff, sspitsyn, dholmes, ihse
| Split |
Split |
Close |
| Expand all |
| Collapse all |
--- old/hotspot/make/solaris/makefiles/vm.make
+++ new/hotspot/make/solaris/makefiles/vm.make
1 1 #
2 -# Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
2 +# Copyright (c) 1998, 2014, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 20 # or visit www.oracle.com if you need additional information or have any
21 21 # questions.
22 22 #
23 23 #
24 24
25 25 # Rules to build JVM and related libraries, included from vm.make in the build
26 26 # directory.
27 27
28 28 # Common build rules.
29 29 MAKEFILES_DIR=$(GAMMADIR)/make/$(Platform_os_family)/makefiles
30 30 include $(MAKEFILES_DIR)/rules.make
31 31 include $(GAMMADIR)/make/altsrc.make
32 32
33 33 default: build
34 34
35 35 #----------------------------------------------------------------------
36 36 # Defs
37 37
38 38 GENERATED = ../generated
39 39 DEP_DIR = $(GENERATED)/dependencies
40 40
41 41 # reads the generated files defining the set of .o's and the .o .h dependencies
42 42 -include $(DEP_DIR)/*.d
43 43
44 44 # read machine-specific adjustments (%%% should do this via buildtree.make?)
45 45 include $(MAKEFILES_DIR)/$(BUILDARCH).make
46 46
47 47 # set VPATH so make knows where to look for source files
48 48 # Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
49 49 # The adfiles directory contains ad_<arch>.[ch]pp.
50 50 # The jvmtifiles directory contains jvmti*.[ch]pp
51 51 Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
52 52 VPATH += $(Src_Dirs_V:%=%:)
53 53
54 54 # set INCLUDES for C preprocessor
55 55 Src_Dirs_I += $(GENERATED)
56 56 INCLUDES += $(Src_Dirs_I:%=-I%)
57 57
58 58 # SYMFLAG is used by {dtrace,jsig,saproc}.make.
59 59 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
60 60 # always build with debug info when we can create .debuginfo files
61 61 # and disable 'lazy debug info' so the .so has everything.
62 62 SYMFLAG = -g -xs
63 63 else
64 64 ifeq (${VERSION}, debug)
65 65 SYMFLAG = -g
66 66 else
67 67 SYMFLAG =
68 68 endif
69 69 endif
70 70
71 71 # The following variables are defined in the generated flags.make file.
72 72 BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\""
73 73 JRE_VERSION = -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\""
74 74 HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
75 75 BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
76 76 BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
77 77 VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
78 78
79 79 CXXFLAGS = \
80 80 ${SYSDEFS} \
81 81 ${INCLUDES} \
82 82 ${BUILD_VERSION} \
83 83 ${BUILD_TARGET} \
84 84 ${BUILD_USER} \
85 85 ${HS_LIB_ARCH} \
86 86 ${VM_DISTRO}
87 87
88 88 # This is VERY important! The version define must only be supplied to vm_version.o
89 89 # If not, ccache will not re-use the cache at all, since the version string might contain
90 90 # a time and date.
91 91 CXXFLAGS/vm_version.o += ${JRE_VERSION}
92 92
93 93 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
94 94
95 95 # File specific flags
96 96 CXXFLAGS += $(CXXFLAGS/BYFILE)
97 97
98 98 # Large File Support
99 99 ifneq ($(LP64), 1)
100 100 CXXFLAGS/ostream.o += -D_FILE_OFFSET_BITS=64
101 101 endif # ifneq ($(LP64), 1)
102 102
103 103 # CFLAGS_WARN holds compiler options to suppress/enable warnings.
104 104 CFLAGS += $(CFLAGS_WARN)
105 105
106 106 # Do not use C++ exception handling
107 107 CFLAGS += $(CFLAGS/NOEX)
108 108
109 109 # Extra flags from gnumake's invocation or environment
110 110 CFLAGS += $(EXTRA_CFLAGS)
111 111
112 112 # Math Library (libm.so), do not use -lm.
113 113 # There might be two versions of libm.so on the build system:
114 114 # libm.so.1 and libm.so.2, and we want libm.so.1.
115 115 # Depending on the Solaris release being used to build with,
116 116 # /usr/lib/libm.so could point at a libm.so.2, so we are
117 117 # explicit here so that the libjvm.so you have built will work on an
118 118 # older Solaris release that might not have libm.so.2.
119 119 # This is a critical factor in allowing builds on Solaris 10 or newer
120 120 # to run on Solaris 8 or 9.
121 121 #
122 122 LIBM=/usr/lib$(ISA_DIR)/libm.so.1
123 123
124 124 ifeq ("${Platform_compiler}", "sparcWorks")
125 125 # The whole megilla:
126 126 ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 505), 1)
127 127 # Old Comment: List the libraries in the order the compiler was designed for
128 128 # Not sure what the 'designed for' comment is referring too above.
129 129 # The order may not be too significant anymore, but I have placed this
130 130 # older libm before libCrun, just to make sure it's found and used first.
131 131 LIBS += -lsocket -lsched -ldl $(LIBM) -lCrun -lthread -ldoor -lc -ldemangle
132 132 else
133 133 ifeq ($(COMPILER_REV_NUMERIC), 502)
134 134 # SC6.1 has it's own libm.so: specifying anything else provokes a name conflict.
135 135 LIBS += -ldl -lthread -lsocket -lm -lsched -ldoor -ldemangle
136 136 else
137 137 LIBS += -ldl -lthread -lsocket $(LIBM) -lsched -ldoor -ldemangle
138 138 endif # 502
139 139 endif # 505
140 140 else
141 141 LIBS += -lsocket -lsched -ldl $(LIBM) -lthread -lc -ldemangle
142 142 endif # sparcWorks
143 143
144 144 LIBS += -lkstat
145 145
|
↓ open down ↓ |
133 lines elided |
↑ open up ↑ |
146 146 # By default, link the *.o into the library, not the executable.
147 147 LINK_INTO$(LINK_INTO) = LIBJVM
148 148
149 149 JDK_LIBDIR = $(JAVA_HOME)/jre/lib/$(LIBARCH)
150 150
151 151 #----------------------------------------------------------------------
152 152 # jvm_db & dtrace
153 153 include $(MAKEFILES_DIR)/dtrace.make
154 154
155 155 #----------------------------------------------------------------------
156 -# add_gnu_debuglink tool
157 -include $(MAKEFILES_DIR)/add_gnu_debuglink.make
158 -
159 -#----------------------------------------------------------------------
160 -# fix_empty_sec_hdr_flags tool
161 -include $(MAKEFILES_DIR)/fix_empty_sec_hdr_flags.make
162 -
163 -#----------------------------------------------------------------------
164 156 # JVM
165 157
166 158 JVM = jvm
167 159 LIBJVM = lib$(JVM).so
168 160
169 161 LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
170 162 LIBJVM_DIZ = lib$(JVM).diz
171 163
172 164 SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt
173 165
174 166 SOURCE_PATHS=\
175 167 $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
176 168 \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
177 169 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
178 170 SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
179 171 SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
180 172 SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
181 173
182 174 CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
183 175 CORE_PATHS+=$(GENERATED)/jvmtifiles $(GENERATED)/tracefiles
184 176
185 177 ifneq ($(INCLUDE_TRACE), false)
186 178 CORE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \
187 179 find $(HS_ALT_SRC)/share/vm/jfr -type d; \
188 180 fi)
189 181 endif
190 182
191 183 COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
192 184 COMPILER1_PATHS += $(HS_COMMON_SRC)/share/vm/c1
193 185
194 186 COMPILER2_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/opto)
195 187 COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt)
196 188 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto
197 189 COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
198 190 COMPILER2_PATHS += $(GENERATED)/adfiles
199 191
200 192 # Include dirs per type.
201 193 Src_Dirs/CORE := $(CORE_PATHS)
202 194 Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
203 195 Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
204 196 Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
205 197 Src_Dirs/ZERO := $(CORE_PATHS)
206 198 Src_Dirs/SHARK := $(CORE_PATHS)
207 199 Src_Dirs := $(Src_Dirs/$(TYPE))
208 200
209 201 COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp c2_\* runtime_\*
210 202 COMPILER1_SPECIFIC_FILES := c1_\*
211 203 SHARK_SPECIFIC_FILES := shark
212 204 ZERO_SPECIFIC_FILES := zero
213 205
214 206 # Always exclude these.
215 207 Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
216 208
217 209 # Exclude per type.
218 210 Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
219 211 Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
220 212 Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
221 213 Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
222 214 Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
223 215 Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES)
224 216
225 217 Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))
226 218
227 219 # Special handling of arch model.
228 220 ifeq ($(Platform_arch_model), x86_32)
229 221 Src_Files_EXCLUDE += \*x86_64\*
230 222 endif
231 223 ifeq ($(Platform_arch_model), x86_64)
232 224 Src_Files_EXCLUDE += \*x86_32\*
233 225 endif
234 226
235 227 # Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE.
236 228 define findsrc
237 229 $(notdir $(shell find $(1)/. ! -name . -prune \
238 230 -a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \
239 231 -a ! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \)))
240 232 endef
241 233
242 234 Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e)))
243 235
244 236 Obj_Files = $(sort $(addsuffix .o,$(basename $(Src_Files))))
245 237
246 238 JVM_OBJ_FILES = $(Obj_Files) $(DTRACE_OBJS)
247 239
248 240 vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES))
249 241
250 242 mapfile : $(MAPFILE) $(MAPFILE_DTRACE_OPT) vm.def mapfile_ext
251 243 rm -f $@
252 244 cat $(MAPFILE) $(MAPFILE_DTRACE_OPT) \
253 245 | $(NAWK) '{ \
254 246 if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") { \
255 247 system ("cat mapfile_ext"); \
256 248 system ("cat vm.def"); \
257 249 } else { \
258 250 print $$0; \
259 251 } \
260 252 }' > $@
261 253
262 254 mapfile_extended : mapfile $(MAPFILE_DTRACE_OPT)
263 255 rm -f $@
264 256 cat $^ > $@
265 257
266 258 vm.def: $(Obj_Files)
267 259 sh $(GAMMADIR)/make/solaris/makefiles/build_vm_def.sh *.o > $@
268 260
269 261 mapfile_ext:
270 262 rm -f $@
271 263 touch $@
272 264 if [ -f $(HS_ALT_MAKE)/solaris/makefiles/mapfile-ext ]; then \
273 265 cat $(HS_ALT_MAKE)/solaris/makefiles/mapfile-ext > $@; \
274 266 fi
275 267
276 268 ifeq ($(LINK_INTO),AOUT)
277 269 LIBJVM.o =
278 270 LIBJVM_MAPFILE =
279 271 LIBS_VM = $(LIBS)
280 272 else
281 273 LIBJVM.o = $(JVM_OBJ_FILES)
282 274 LIBJVM_MAPFILE$(LDNOMAP) = mapfile_extended
283 275 LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
284 276 LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM))
285 277 ifndef USE_GCC
286 278 LIBS_VM = $(LIBS)
287 279 else
288 280 # JVM is statically linked with libgcc[_s] and libstdc++; this is needed to
289 281 # get around library dependency and compatibility issues. Must use gcc not
290 282 # g++ to link.
291 283 LFLAGS_VM += $(STATIC_LIBGCC)
|
↓ open down ↓ |
118 lines elided |
↑ open up ↑ |
292 284 LIBS_VM += $(STATIC_STDCXX) $(LIBS)
293 285 endif
294 286 endif
295 287
296 288 ifdef USE_GCC
297 289 LINK_VM = $(LINK_LIB.CC)
298 290 else
299 291 LINK_VM = $(LINK_LIB.CXX)
300 292 endif
301 293 # making the library:
302 -$(LIBJVM): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(LIBJVM.o) $(LIBJVM_MAPFILE)
294 +$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE)
303 295 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
304 296 @echo Linking vm...
305 297 $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK)
306 298 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM)
307 299 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK)
308 300 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1
309 301 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
310 -# gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
311 -# Clear the SHF_ALLOC flag (if set) from empty section headers.
312 -# An empty section header has sh_addr == 0 and sh_size == 0.
313 -# This problem has only been seen on Solaris X64, but we call this tool
314 -# on all Solaris builds just in case.
315 - $(QUIETLY) $(FIX_EMPTY_SEC_HDR_FLAGS) $@
316 302 $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
317 -# $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
318 -# Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
319 -# $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
320 - $(QUIETLY) $(ADD_GNU_DEBUGLINK) $(LIBJVM_DEBUGINFO) $@
303 + $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
321 304 ifeq ($(STRIP_POLICY),all_strip)
322 305 $(QUIETLY) $(STRIP) $@
323 306 else
324 307 ifeq ($(STRIP_POLICY),min_strip)
325 308 $(QUIETLY) $(STRIP) -x $@
326 309 # implied else here is no stripping at all
327 310 endif
328 311 endif
329 312 ifeq ($(ZIP_DEBUGINFO_FILES),1)
330 313 $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
331 314 $(RM) $(LIBJVM_DEBUGINFO)
332 315 endif
333 316 endif
334 317 endif # filter -sbfast -xsbfast
335 318
336 319
337 320 DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
338 321 DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)
339 322 DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO)
340 323 DEST_JVM_DIZ = $(DEST_SUBDIR)/$(LIBJVM_DIZ)
341 324
342 325 install_jvm: $(LIBJVM)
343 326 @echo "Copying $(LIBJVM) to $(DEST_JVM)"
344 327 $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \
345 328 cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
346 329 $(QUIETLY) test -f $(LIBJVM_DIZ) && \
347 330 cp -f $(LIBJVM_DIZ) $(DEST_JVM_DIZ)
348 331 $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"
349 332
350 333 #----------------------------------------------------------------------
351 334 # Other files
352 335
353 336 # Signal interposition library
354 337 include $(MAKEFILES_DIR)/jsig.make
355 338
356 339 # Serviceability agent
357 340 include $(MAKEFILES_DIR)/saproc.make
358 341
359 342 #----------------------------------------------------------------------
360 343
361 344 build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(LIBJVM_DTRACE) $(BUILDLIBSAPROC) dtraceCheck
362 345
363 346 install: install_jvm install_jsig install_saproc
364 347
365 348 .PHONY: default build install install_jvm
|
↓ open down ↓ |
35 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX